diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-11-13 23:01:35 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-11-13 23:01:35 +0000 |
| commit | 1ace3742a3f7bf9c09ca72a6f31058631e945a27 (patch) | |
| tree | d96936becaa6fa7b01dec4f71e070ea766266752 /pkgs/tools/compression | |
| parent | 5474c6518f963d31ebcc61f77e8d44eebcdf88af (diff) | |
| download | nixpkgs-1ace3742a3f7bf9c09ca72a6f31058631e945a27.tar nixpkgs-1ace3742a3f7bf9c09ca72a6f31058631e945a27.tar.gz nixpkgs-1ace3742a3f7bf9c09ca72a6f31058631e945a27.tar.bz2 nixpkgs-1ace3742a3f7bf9c09ca72a6f31058631e945a27.tar.lz nixpkgs-1ace3742a3f7bf9c09ca72a6f31058631e945a27.tar.xz nixpkgs-1ace3742a3f7bf9c09ca72a6f31058631e945a27.tar.zst nixpkgs-1ace3742a3f7bf9c09ca72a6f31058631e945a27.zip | |
* Fix bzip2 on cygwin.
svn path=/nixpkgs/trunk/; revision=7025
Diffstat (limited to 'pkgs/tools/compression')
| -rw-r--r-- | pkgs/tools/compression/bzip2/builder-cygwin.sh | 26 | ||||
| -rw-r--r-- | pkgs/tools/compression/bzip2/default.nix | 2 |
2 files changed, 27 insertions, 1 deletions
diff --git a/pkgs/tools/compression/bzip2/builder-cygwin.sh b/pkgs/tools/compression/bzip2/builder-cygwin.sh new file mode 100644 index 00000000000..efeb9dac657 --- /dev/null +++ b/pkgs/tools/compression/bzip2/builder-cygwin.sh @@ -0,0 +1,26 @@ +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/default.nix b/pkgs/tools/compression/bzip2/default.nix index b7a2717b85e..20b0d5ebe16 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 = ./builder.sh; + builder = if stdenv.system == "i686-cygwin" then ./builder-cygwin.sh else ./builder.sh; # !!! merge src = fetchurl { url = http://nix.cs.uu.nl/dist/tarballs/bzip2-1.0.3.tar.gz; |