Commit 899a790d authored by oxalica's avatar oxalica
Browse files

jq: merge output "lib" into "out"

parent 75406713

pkgs/by-name/jq/jq/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 ''

pkgs/development/r-modules/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 ];

pkgs/development/tools/zsv/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec { 
  buildInputs = [ jq ];



  configureFlags = [

    "--jq-prefix=${jq.lib}"

    "--jq-prefix=${lib.getLib jq}"

  ];



  meta = with lib; {