diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-18 15:49:47 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-18 15:49:47 +0000 |
| commit | f3619824a9fe8bc6650ded1827846b76865c86a8 (patch) | |
| tree | c9c01e73ddfa3f335fb4bf982160e698f7957540 /pkgs/tools/compression/bzip2 | |
| parent | efc2b12da5e768c3bdbe3347d730556bbb866cdb (diff) | |
| download | nixlib-f3619824a9fe8bc6650ded1827846b76865c86a8.tar nixlib-f3619824a9fe8bc6650ded1827846b76865c86a8.tar.gz nixlib-f3619824a9fe8bc6650ded1827846b76865c86a8.tar.bz2 nixlib-f3619824a9fe8bc6650ded1827846b76865c86a8.tar.lz nixlib-f3619824a9fe8bc6650ded1827846b76865c86a8.tar.xz nixlib-f3619824a9fe8bc6650ded1827846b76865c86a8.tar.zst nixlib-f3619824a9fe8bc6650ded1827846b76865c86a8.zip | |
* bzip2 with dietlibc.
svn path=/nixpkgs/trunk/; revision=6767
Diffstat (limited to 'pkgs/tools/compression/bzip2')
| -rw-r--r-- | pkgs/tools/compression/bzip2/builder-static.sh (renamed from pkgs/tools/compression/bzip2/builder-darwin.sh) | 0 | ||||
| -rw-r--r-- | pkgs/tools/compression/bzip2/default.nix | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/tools/compression/bzip2/builder-darwin.sh b/pkgs/tools/compression/bzip2/builder-static.sh index 8d666c925e7b..8d666c925e7b 100644 --- a/pkgs/tools/compression/bzip2/builder-darwin.sh +++ b/pkgs/tools/compression/bzip2/builder-static.sh diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index be387bb46be5..d932d7689301 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -3,7 +3,8 @@ stdenv.mkDerivation { name = "bzip2-1.0.3"; builder = - if stdenv.isDarwin then ./builder-darwin.sh + # !!! Merge these builders. + if stdenv.isDarwin || stdenv ? isDietLibC then ./builder-static.sh else if stdenv.system == "i686-freebsd" then ./builder-freebsd.sh else if stdenv.system == "i686-cygwin" then ./builder-cygwin.sh else ./builder.sh; |