diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-27 11:37:29 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-07-27 11:37:29 +0000 |
| commit | 3c57f1fd8a53e532d505461e740bbef5e4c960bc (patch) | |
| tree | d6e2b6ce2bcb53b4c4533ea79ef10bbc35e80fd0 /pkgs/development/libraries/zlib/default.nix | |
| parent | 42016ca6aa10b305235077b733dd69c3a29ba75d (diff) | |
| download | nixpkgs-3c57f1fd8a53e532d505461e740bbef5e4c960bc.tar nixpkgs-3c57f1fd8a53e532d505461e740bbef5e4c960bc.tar.gz nixpkgs-3c57f1fd8a53e532d505461e740bbef5e4c960bc.tar.bz2 nixpkgs-3c57f1fd8a53e532d505461e740bbef5e4c960bc.tar.lz nixpkgs-3c57f1fd8a53e532d505461e740bbef5e4c960bc.tar.xz nixpkgs-3c57f1fd8a53e532d505461e740bbef5e4c960bc.tar.zst nixpkgs-3c57f1fd8a53e532d505461e740bbef5e4c960bc.zip | |
* Fix zlib 1.2.5 on Cygwin. (The Makefile doesn't support building
just a static library.) svn path=/nixpkgs/trunk/; revision=22748
Diffstat (limited to 'pkgs/development/libraries/zlib/default.nix')
| -rw-r--r-- | pkgs/development/libraries/zlib/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index df834f9f885..a4a91960c0b 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, static ? false}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "zlib-1.2.5"; src = fetchurl { @@ -23,4 +23,7 @@ stdenv.mkDerivation rec { # zlib doesn't like the automatic --disable-shared from the Cygwin stdenv. cygwinConfigureEnableShared = true; -} + +} // stdenv.lib.optionalAttrs (stdenv.system == "i686-cygwin") { + patches = [ ./no-shared.patch ]; +}) |