summary refs log tree commit diff
path: root/pkgs/development/libraries/zlib
diff options
context:
space:
mode:
authorJohn Ericson <Ericson2314@Yahoo.com>2017-04-26 00:06:11 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2017-06-22 17:52:28 -0400
commit594d26420594acf458e5a8ab75229a2147d9194f (patch)
tree9211ca90764bdb1810aa4c2a5fb0e5fd51f78a76 /pkgs/development/libraries/zlib
parent9bfd03eff78aa37bff9a7f4cb12c6bed1f04e764 (diff)
downloadnixpkgs-594d26420594acf458e5a8ab75229a2147d9194f.tar
nixpkgs-594d26420594acf458e5a8ab75229a2147d9194f.tar.gz
nixpkgs-594d26420594acf458e5a8ab75229a2147d9194f.tar.bz2
nixpkgs-594d26420594acf458e5a8ab75229a2147d9194f.tar.lz
nixpkgs-594d26420594acf458e5a8ab75229a2147d9194f.tar.xz
nixpkgs-594d26420594acf458e5a8ab75229a2147d9194f.tar.zst
nixpkgs-594d26420594acf458e5a8ab75229a2147d9194f.zip
cross stdenv adaptor: Support --host --build --target across the board
Packages get --host and --target by default, but can explicitly request
any subset to be passed as needed. See docs for more info.

rustc: Avoid hash breakage by using the old (ignored)
dontSetConfigureCross when not cross building
Diffstat (limited to 'pkgs/development/libraries/zlib')
-rw-r--r--pkgs/development/libraries/zlib/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 5d96299380e..dc6f0a455d8 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
   crossAttrs = {
     dontStrip = static;
-    dontSetConfigureCross = true;
+    configurePlatforms = [];
   } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") {
     installFlags = [
       "BINARY_PATH=$(out)/bin"