public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zlib: cc-wrapper can be relied on to export this env var

Browse Source
This commit is contained in:
John Ericson 2017-06-28 14:23:59 -04:00
parent 895c361480
commit da668f66c7
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/zlib/default.nix
View File

@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
crossAttrs = { crossAttrs = {
dontStrip = static; dontStrip = static;
configurePlatforms = []; configurePlatforms = [];
} // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") { } // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") {
installFlags = [ installFlags = [
"BINARY_PATH=$(out)/bin" "BINARY_PATH=$(out)/bin"
"INCLUDE_PATH=$(dev)/include" "INCLUDE_PATH=$(dev)/include"
@ -68,14 +68,12 @@ stdenv.mkDerivation rec {
]; ];
makeFlags = [ makeFlags = [
"-f" "win32/Makefile.gcc" "-f" "win32/Makefile.gcc"
"PREFIX=${stdenv.cross.config}-" "PREFIX=${stdenv.cc.prefix}"
] ++ stdenv.lib.optional (!static) "SHARED_MODE=1"; ] ++ stdenv.lib.optional (!static) "SHARED_MODE=1";
# Non-typical naming confuses libtool which then refuses to use zlib's DLL # Non-typical naming confuses libtool which then refuses to use zlib's DLL
# in some cases, e.g. when compiling libpng. # in some cases, e.g. when compiling libpng.
postInstall = postInstall + "ln -s zlib1.dll $out/bin/libz.dll"; postInstall = postInstall + "ln -s zlib1.dll $out/bin/libz.dll";
} // stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
makeFlags = [ "RANLIB=${stdenv.cross.config}-ranlib" ];
}; };
passthru.version = version; passthru.version = version;