diff --git a/pkgs/tools/compression/bzip2/builder-cygwin.sh b/pkgs/tools/compression/bzip2/builder-cygwin.sh deleted file mode 100644 index 0090a18f48b..00000000000 --- a/pkgs/tools/compression/bzip2/builder-cygwin.sh +++ /dev/null @@ -1,4 +0,0 @@ -source $stdenv/setup -installFlags="PREFIX=$out" - -genericBuild diff --git a/pkgs/tools/compression/bzip2/builder-freebsd.sh b/pkgs/tools/compression/bzip2/builder-freebsd.sh deleted file mode 100644 index fb5f7ae4250..00000000000 --- a/pkgs/tools/compression/bzip2/builder-freebsd.sh +++ /dev/null @@ -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 - diff --git a/pkgs/tools/compression/bzip2/builder-static.sh b/pkgs/tools/compression/bzip2/builder-static.sh deleted file mode 100644 index 8d666c925e7..00000000000 --- a/pkgs/tools/compression/bzip2/builder-static.sh +++ /dev/null @@ -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 diff --git a/pkgs/tools/compression/bzip2/builder.sh b/pkgs/tools/compression/bzip2/builder.sh index 51c911ad161..c0b92a840e6 100644 --- a/pkgs/tools/compression/bzip2/builder.sh +++ b/pkgs/tools/compression/bzip2/builder.sh @@ -1,17 +1,20 @@ source $stdenv/setup installFlags="PREFIX=$out" -preBuild=preBuild -preBuild() { - make -f Makefile-libbz2_so -} +if test -n "$sharedLibrary"; then -preInstall=preInstall -preInstall() { - ensureDir $out/lib - cp -pd libbz2.so* $out/lib - ln -s libbz2.so.*.*.* $out/lib/libbz2.so -} + preBuild=preBuild + preBuild() { + make -f Makefile-libbz2_so + } + + preInstall=preInstall + preInstall() { + ensureDir $out/lib + mv libbz2.so* $out/lib + } + +fi postInstall=postInstall postInstall() { @@ -21,4 +24,3 @@ postInstall() { } genericBuild - diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index d932d768930..144910ef3a4 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -2,14 +2,13 @@ stdenv.mkDerivation { name = "bzip2-1.0.3"; - builder = - # !!! 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; + builder = ./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"; }