summary refs log tree commit diff
path: root/pkgs/tools/compression/bzip2/default.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2006-12-27 17:58:32 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2006-12-27 17:58:32 +0000
commitf6d923febc594c7a1fc3295e01972b049569e292 (patch)
treed8a14e34749cf1f8132df5cbc8a48355a6392010 /pkgs/tools/compression/bzip2/default.nix
parent7a2c0d179372af99caec3c3f72d1a25cde28b8ab (diff)
downloadnixpkgs-f6d923febc594c7a1fc3295e01972b049569e292.tar
nixpkgs-f6d923febc594c7a1fc3295e01972b049569e292.tar.gz
nixpkgs-f6d923febc594c7a1fc3295e01972b049569e292.tar.bz2
nixpkgs-f6d923febc594c7a1fc3295e01972b049569e292.tar.lz
nixpkgs-f6d923febc594c7a1fc3295e01972b049569e292.tar.xz
nixpkgs-f6d923febc594c7a1fc3295e01972b049569e292.tar.zst
nixpkgs-f6d923febc594c7a1fc3295e01972b049569e292.zip
* Merge builder-cygwin.sh.
svn path=/nixpkgs/trunk/; revision=7497
Diffstat (limited to 'pkgs/tools/compression/bzip2/default.nix')
-rw-r--r--pkgs/tools/compression/bzip2/default.nix2
1 files changed, 1 insertions, 1 deletions
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;