diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 17:58:32 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 17:58:32 +0000 |
| commit | f6d923febc594c7a1fc3295e01972b049569e292 (patch) | |
| tree | d8a14e34749cf1f8132df5cbc8a48355a6392010 /pkgs/tools/compression/bzip2 | |
| parent | 7a2c0d179372af99caec3c3f72d1a25cde28b8ab (diff) | |
| download | nixlib-f6d923febc594c7a1fc3295e01972b049569e292.tar nixlib-f6d923febc594c7a1fc3295e01972b049569e292.tar.gz nixlib-f6d923febc594c7a1fc3295e01972b049569e292.tar.bz2 nixlib-f6d923febc594c7a1fc3295e01972b049569e292.tar.lz nixlib-f6d923febc594c7a1fc3295e01972b049569e292.tar.xz nixlib-f6d923febc594c7a1fc3295e01972b049569e292.tar.zst nixlib-f6d923febc594c7a1fc3295e01972b049569e292.zip | |
* Merge builder-cygwin.sh.
svn path=/nixpkgs/trunk/; revision=7497
Diffstat (limited to 'pkgs/tools/compression/bzip2')
| -rw-r--r-- | pkgs/tools/compression/bzip2/builder-cygwin.sh | 26 | ||||
| -rw-r--r-- | pkgs/tools/compression/bzip2/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/tools/compression/bzip2/default.nix | 2 |
3 files changed, 2 insertions, 28 deletions
diff --git a/pkgs/tools/compression/bzip2/builder-cygwin.sh b/pkgs/tools/compression/bzip2/builder-cygwin.sh deleted file mode 100644 index efeb9dac657c..000000000000 --- 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 c0b92a840e67..efeb9dac657c 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 20b0d5ebe160..b7a2717b85e9 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; |