* Merge builder-cygwin.sh.

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

maintainers/docs/todo.txt

@@ -10,5 +10,3 @@
 * Add gettext to glib propagatedBuildInputs?  Glib's `gi18n.h' doesn't
   seem to like Glibc `libintl.h'; needs the gettext one instead.
   [Move from libbonoboui]
-
-* Fix the bzip2 build generically.

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

@@ -1,26 +0,0 @@
-source $stdenv/setup
-installFlags="PREFIX=$out"
-
-if test -n "$sharedLibrary"; then
-
-    preBuild=preBuild
-    preBuild() {
-        make -f Makefile-libbz2_so
-    }
-
-    preInstall=preInstall
-    preInstall() {
-        ensureDir $out/lib
-        mv libbz2.so* $out/lib
-    }
-    
-fi
-
-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

@@ -18,7 +18,7 @@ fi
 
 postInstall=postInstall
 postInstall() {
-    rm $out/bin/bunzip2 $out/bin/bzcat
+    rm $out/bin/bunzip2* $out/bin/bzcat*
     ln -s bzip2 $out/bin/bunzip2
     ln -s bzip2 $out/bin/bzcat
 }

pkgs/tools/compression/bzip2/default.nix

@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "bzip2-1.0.3";
-  builder = if stdenv.system == "i686-cygwin" then ./builder-cygwin.sh else ./builder.sh; # !!! merge
+  builder = ./builder.sh;
     
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/bzip2-1.0.3.tar.gz;