summary refs log tree commit diff
path: root/pkgs/development/libraries/zlib
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-03-01 23:15:21 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-03-01 23:15:21 +0000
commita753c4a170b12f6522337bc1f18d47f22cb7d277 (patch)
tree4c7b74eabf4954e880bc6e7ed2da5bcff9d2c7e4 /pkgs/development/libraries/zlib
parent11d1104a885bebce1b4ec226cfad648422d9669d (diff)
* GCC 4.6.3 and 4.5.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32734
Diffstat (limited to 'pkgs/development/libraries/zlib')
-rw-r--r--pkgs/development/libraries/zlib/default.nix6
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index f3c1684fa3f57..eecdc80da5e8e 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
     sha256 = "06x6m33ls1606ni7275q5z392csvh18dgs55kshfnvrfal45w8r1";
   };
 
-  patches = [ ];
-
   configureFlags = if static then "" else "--shared";
 
   preConfigure = ''
@@ -30,7 +28,7 @@ stdenv.mkDerivation rec {
 
   crossAttrs = {
     dontStrip = if static then true else false;
-  } // (if stdenv.cross.libc == "msvcrt" then {
+  } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") {
     configurePhase=''
       installFlags="BINARY_PATH=$out/bin INCLUDE_PATH=$out/include LIBRARY_PATH=$out/lib"
     '';
@@ -38,7 +36,7 @@ stdenv.mkDerivation rec {
       "-f" "win32/Makefile.gcc"
       "PREFIX=${stdenv.cross.config}-"
     ] ++ (if static then [] else [ "SHARED_MODE=1" ]);
-  } else {});
+  };
 
   # zlib doesn't like the automatic --disable-shared from the Cygwin stdenv.
   cygwinConfigureEnableShared = true;