From f6d923febc594c7a1fc3295e01972b049569e292 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 27 Dec 2006 17:58:32 +0000 Subject: [PATCH] * Merge builder-cygwin.sh. svn path=/nixpkgs/trunk/; revision=7497 --- maintainers/docs/todo.txt | 2 -- .../tools/compression/bzip2/builder-cygwin.sh | 26 ------------------- pkgs/tools/compression/bzip2/builder.sh | 2 +- pkgs/tools/compression/bzip2/default.nix | 2 +- 4 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 pkgs/tools/compression/bzip2/builder-cygwin.sh diff --git a/maintainers/docs/todo.txt b/maintainers/docs/todo.txt index 02d7b041232..adf1c0dff58 100644 --- a/maintainers/docs/todo.txt +++ b/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. diff --git a/pkgs/tools/compression/bzip2/builder-cygwin.sh b/pkgs/tools/compression/bzip2/builder-cygwin.sh deleted file mode 100644 index efeb9dac657..00000000000 --- a/pkgs/tools/compression/bzip2/builder-cygwin.sh +++ /dev/null @@ -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 diff --git a/pkgs/tools/compression/bzip2/builder.sh b/pkgs/tools/compression/bzip2/builder.sh index c0b92a840e6..efeb9dac657 100644 --- a/pkgs/tools/compression/bzip2/builder.sh +++ b/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 } diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 20b0d5ebe16..b7a2717b85e 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/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;