mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
jq: merge output "lib" into "out"
This commit is contained in:
parent
75406713eb
commit
899a790d80
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-R4ycoSn9LjRD/icxS0VeIR4NjGC8j/ffcDhz3u7lgMI=";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "doc" "man" "dev" "lib" "out" ];
|
||||
outputs = [ "bin" "doc" "man" "dev" "out" ];
|
||||
|
||||
# https://github.com/jqlang/jq/issues/2871
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isFreeBSD ''
|
||||
|
@ -645,7 +645,7 @@ let
|
||||
SuperGauss = [ pkgs.pkg-config pkgs.fftw.dev];
|
||||
specklestar = [ pkgs.fftw.dev ];
|
||||
cartogramR = [ pkgs.fftw.dev ];
|
||||
jqr = [ pkgs.jq.lib ];
|
||||
jqr = [ pkgs.jq.out ];
|
||||
kza = [ pkgs.pkg-config ];
|
||||
igraph = with pkgs; [ gmp libxml2.dev glpk ];
|
||||
interpolation = [ pkgs.gmp ];
|
||||
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ jq ];
|
||||
|
||||
configureFlags = [
|
||||
"--jq-prefix=${jq.lib}"
|
||||
"--jq-prefix=${lib.getLib jq}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
Loading…
Reference in New Issue
Block a user