* bzip2 with dietlibc.

svn path=/nixpkgs/trunk/; revision=6767

5 files changed, 2 insertions, 36 deletions

diff --git a/pkgs/tools/compression/bzip2-static/builder.sh b/pkgs/tools/compression/bzip2-static/builder.sh
deleted file mode 100644
index 1250d58170af..000000000000
--- a/pkgs/tools/compression/bzip2-static/builder.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-source $stdenv/setup
-installFlags="PREFIX=$out"
-
-postInstall=postInstall
-postInstall() {
-    rm $out/bin/bunzip2 $out/bin/bzcat
-    ln -s bzip2 $out/bin/bunzip2
-    ln -s bzip2 $out/bin/bzcat
-}
-
-genericBuild
-
diff --git a/pkgs/tools/compression/bzip2-static/bzip2-1.0.3-static.patch b/pkgs/tools/compression/bzip2-static/bzip2-1.0.3-static.patch
deleted file mode 100644
index 603ed15877b8..000000000000
--- a/pkgs/tools/compression/bzip2-static/bzip2-1.0.3-static.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN bzip2-1.0.3/Makefile bzip2-1.0.3.new/Makefile
---- bzip2-1.0.3/Makefile	2005-02-17 12:28:24.000000000 +0100
-+++ bzip2-1.0.3.new/Makefile	2006-01-01 14:30:08.000000000 +0100
-@@ -2,7 +2,7 @@
- SHELL=/bin/sh
- 
- # To assist in cross-compiling
--CC=gcc
-+CC=gcc -static
- AR=ar
- RANLIB=ranlib
- LDFLAGS=
diff --git a/pkgs/tools/compression/bzip2-static/default.nix b/pkgs/tools/compression/bzip2-static/default.nix
deleted file mode 100644
index f5c14266d0ae..000000000000
--- a/pkgs/tools/compression/bzip2-static/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "bzip2-1.0.3";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/bzip2-1.0.3.tar.gz;
-    md5 = "8a716bebecb6e647d2e8a29ea5d8447f";
-  };
-  patches = [./bzip2-1.0.3-static.patch];
-}
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;