mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-22 21:18:28 +03:00
zlib: on mingw, add another DLL link
Also clean up the expression a little. It fixes at least libpng's DLL.
This commit is contained in:
parent
80509ab287
commit
321ecde8a1
@ -52,14 +52,21 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
crossAttrs = {
|
crossAttrs = {
|
||||||
dontStrip = static;
|
dontStrip = static;
|
||||||
|
dontSetConfigureCross = true;
|
||||||
} // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") {
|
} // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") {
|
||||||
configurePhase=''
|
installFlags = [
|
||||||
installFlags="BINARY_PATH=$out/bin INCLUDE_PATH=$out/include LIBRARY_PATH=$out/lib"
|
"BINARY_PATH=$(out)/bin"
|
||||||
'';
|
"INCLUDE_PATH=$(dev)/include"
|
||||||
|
"LIBRARY_PATH=$(out)/lib"
|
||||||
|
];
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
"-f" "win32/Makefile.gcc"
|
"-f" "win32/Makefile.gcc"
|
||||||
"PREFIX=${stdenv.cross.config}-"
|
"PREFIX=${stdenv.cross.config}-"
|
||||||
] ++ (if static then [] else [ "SHARED_MODE=1" ]);
|
] ++ stdenv.lib.optional (!static) "SHARED_MODE=1";
|
||||||
|
|
||||||
|
# Non-typical naming confuses libtool which then refuses to use zlib's DLL
|
||||||
|
# in some cases, e.g. when compiling libpng.
|
||||||
|
postInstall = postInstall + "ln -s zlib1.dll $out/bin/libz.dll";
|
||||||
} // stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
|
} // stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
|
||||||
makeFlags = [ "RANLIB=${stdenv.cross.config}-ranlib" ];
|
makeFlags = [ "RANLIB=${stdenv.cross.config}-ranlib" ];
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user