diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-13 09:25:28 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-13 09:25:28 +0200 |
commit | 39ebb01d6e8d19b042fe65d303234d0db27877eb (patch) | |
tree | 083025f5791bfce9f14e1d3f4c66035ef82ba72d /pkgs/tools/compression | |
parent | 81cedab4f1fe9578e004ce03de5630a25c737a9e (diff) | |
parent | 87b49397bf1e26ac17c4a55fed41bd836fefc39d (diff) | |
download | nixlib-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar nixlib-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar.gz nixlib-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar.bz2 nixlib-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar.lz nixlib-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar.xz nixlib-39ebb01d6e8d19b042fe65d303234d0db27877eb.tar.zst nixlib-39ebb01d6e8d19b042fe65d303234d0db27877eb.zip |
Merge branch 'staging', containing closure-size #7701
Diffstat (limited to 'pkgs/tools/compression')
-rw-r--r-- | pkgs/tools/compression/bzip2/default.nix | 13 | ||||
-rw-r--r-- | pkgs/tools/compression/gzip/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/compression/kzipmix/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/compression/pxz/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/compression/xz/default.nix | 2 |
5 files changed, 19 insertions, 8 deletions
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 66ff5612dd4a..a165ab2b157b 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -41,6 +41,8 @@ in stdenv.mkDerivation { postInstall = ""; }; + outputs = [ "dev" "bin" "static" ] ++ stdenv.lib.optional sharedLibrary "out"; + preBuild = stdenv.lib.optionalString sharedLibrary '' make -f ${if stdenv.isDarwin then "Makefile-libbz2_dylib" else "Makefile-libbz2_so"} ''; @@ -61,12 +63,15 @@ in stdenv.mkDerivation { ) ''); - installFlags = [ "PREFIX=$(out)" ]; + installFlags = [ "PREFIX=$(bin)" ]; postInstall = '' - rm $out/bin/bunzip2* $out/bin/bzcat* - ln -s bzip2 $out/bin/bunzip2 - ln -s bzip2 $out/bin/bzcat + rm $bin/bin/bunzip2* $bin/bin/bzcat* + ln -s bzip2 $bin/bin/bunzip2 + ln -s bzip2 $bin/bin/bzcat + + mkdir "$static" + mv "$bin/lib" "$static/" ''; postPatch = '' diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 6772e21cb0cb..009246b69a08 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, xz }: stdenv.mkDerivation rec { name = "gzip-1.6"; @@ -8,8 +8,12 @@ stdenv.mkDerivation rec { sha256 = "0ivqnbhiwd12q8hp3qw6rpsrpw2jg5y2mymk8cn22lsx90dfvprp"; }; + outputs = [ "out" "man" "info" ]; + enableParallelBuilding = true; + buildInputs = [ xz.bin ]; + preConfigure = if stdenv.isCygwin then '' sed -i lib/fpending.h -e 's,include <stdio_ext.h>,,' '' else null; diff --git a/pkgs/tools/compression/kzipmix/default.nix b/pkgs/tools/compression/kzipmix/default.nix index f768189040b5..6fcff7b29280 100644 --- a/pkgs/tools/compression/kzipmix/default.nix +++ b/pkgs/tools/compression/kzipmix/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation { mkdir -p $out/bin cp kzip zipmix $out/bin - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/bin/kzip - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/bin/zipmix + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/kzip + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/zipmix ''; meta = { diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix index 07c3e205a982..f6424b5e8803 100644 --- a/pkgs/tools/compression/pxz/default.nix +++ b/pkgs/tools/compression/pxz/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { gcc -o pxz pxz.c -llzma \ -fopenmp -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 \ -DPXZ_BUILD_DATE=\"nixpkgs\" \ - -DXZ_BINARY=\"${xz}/bin/xz\" \ + -DXZ_BINARY=\"${xz.bin}/bin/xz\" \ -DPXZ_VERSION=\"${version}\" ''; diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 5f5ee28ca063..5d6a8634b1ba 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1da071wyx921pyx3zkxlnbpp14p6km98pnp66mg1arwi9dxgbxbg"; }; + outputs = [ "dev" "out" "bin" "man" "doc" ]; + doCheck = true; # In stdenv-linux, prevent a dependency on bootstrap-tools. |