diff options
| author | Florian Friesdorf <flo@chaoflow.net> | 2014-10-24 02:35:07 +0200 |
|---|---|---|
| committer | Rok Garbas <rok@garbas.si> | 2015-05-28 10:53:36 +0200 |
| commit | d2da94cc0bd8555b99bc54e2654208b5eeb54d94 (patch) | |
| tree | 9e717eb0dd326d8fd6f8ad5c7dff3996c271defe /pkgs/development/libraries/zlib | |
| parent | af5484a630c65564c27e31eb658ded80a7751808 (diff) | |
| download | nixpkgs-d2da94cc0bd8555b99bc54e2654208b5eeb54d94.tar nixpkgs-d2da94cc0bd8555b99bc54e2654208b5eeb54d94.tar.gz nixpkgs-d2da94cc0bd8555b99bc54e2654208b5eeb54d94.tar.bz2 nixpkgs-d2da94cc0bd8555b99bc54e2654208b5eeb54d94.tar.lz nixpkgs-d2da94cc0bd8555b99bc54e2654208b5eeb54d94.tar.xz nixpkgs-d2da94cc0bd8555b99bc54e2654208b5eeb54d94.tar.zst nixpkgs-d2da94cc0bd8555b99bc54e2654208b5eeb54d94.zip | |
cygwin: zlib - we do not --disable-shared
Diffstat (limited to 'pkgs/development/libraries/zlib')
| -rw-r--r-- | pkgs/development/libraries/zlib/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 162bae54d37..419a2584ca8 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -40,8 +40,8 @@ stdenv.mkDerivation (rec { makeFlags = [ "RANLIB=${stdenv.cross.config}-ranlib" ]; }; - # zlib doesn't like the automatic --disable-shared from the Cygwin stdenv. - cygwinConfigureEnableShared = true; + # CYGXXX: This is not needed anymore and non-functional, but left not to trigger rebuilds + cygwinConfigureEnableShared = if (!stdenv.isCygwin) then true else null; passthru.version = version; |