* Unify the bzip2 builders.

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

pkgs/tools/compression/bzip2/builder-cygwin.sh

@@ -1,4 +0,0 @@
-source $stdenv/setup
-installFlags="PREFIX=$out"
-
-genericBuild

pkgs/tools/compression/bzip2/builder-freebsd.sh

@@ -1,24 +0,0 @@
-source $stdenv/setup
-installFlags="PREFIX=$out"
-
-preBuild=preBuild
-preBuild() {
-    make -f Makefile-libbz2_so
-}
-
-preInstall=preInstall
-preInstall() {
-    ensureDir $out/lib
-    cp -p libbz2.so* $out/lib
-    ln -s libbz2.so.*.*.* $out/lib/libbz2.so
-}
-
-postInstall=postInstall
-postInstall() {
-    rm $out/bin/bunzip2 $out/bin/bzcat
-    ln -s bzip2 $out/bin/bunzip2
-    ln -s bzip2 $out/bin/bzcat
-}
-
-genericBuild
-

pkgs/tools/compression/bzip2/builder-static.sh

@@ -1,11 +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

pkgs/tools/compression/bzip2/builder.sh

@@ -1,17 +1,20 @@
 source $stdenv/setup
 installFlags="PREFIX=$out"
 
-preBuild=preBuild
+if test -n "$sharedLibrary"; then
-preBuild() {
-    make -f Makefile-libbz2_so
-}
 
-preInstall=preInstall
+    preBuild=preBuild
-preInstall() {
+    preBuild() {
-    ensureDir $out/lib
+        make -f Makefile-libbz2_so
-    cp -pd libbz2.so* $out/lib
+    }
-    ln -s libbz2.so.*.*.* $out/lib/libbz2.so
+
-}
+    preInstall=preInstall
+    preInstall() {
+        ensureDir $out/lib
+        mv libbz2.so* $out/lib
+    }
+    
+fi
 
 postInstall=postInstall
 postInstall() {
@@ -21,4 +24,3 @@ postInstall() {
 }
 
 genericBuild
-

pkgs/tools/compression/bzip2/default.nix

@@ -2,14 +2,13 @@
 
 stdenv.mkDerivation {
   name = "bzip2-1.0.3";
-  builder =
+  builder = ./builder.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;
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/bzip2-1.0.3.tar.gz;
     md5 = "8a716bebecb6e647d2e8a29ea5d8447f";
   };
+
+  sharedLibrary =
+    !stdenv.isDarwin && !(stdenv ? isDietLibC) && system != "i686-cygwin";
 }