nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 23:22:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

stdenv on mingw: fix 64-bin DLL detection in some cases

Browse Source 
In particular, this makes 64-bit libpng create DLL now,
and thus depending packages won't fail anymore (e.g. freetype).
This commit is contained in:
Vladimír Čunát 2016-04-14 08:59:47 +02:00
parent afaf1c2f77
commit 8b292a1b35
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/stdenv/adapters.nix
View File

@ -96,8 +96,12 @@ rec {
name = name + "-" + cross.config; name = name + "-" + cross.config;
nativeBuildInputs = nativeBuildInputsDrvs nativeBuildInputs = nativeBuildInputsDrvs
++ nativeInputsFromBuildInputs ++ nativeInputsFromBuildInputs
++ [ gccCross binutilsCross ] ++ ++ [ gccCross binutilsCross ]
stdenv.lib.optional selfNativeBuildInput nativeDrv; ++ stdenv.lib.optional selfNativeBuildInput nativeDrv
# without proper `file` command, libtool sometimes fails
# to recognize 64-bit DLLs
++ stdenv.lib.optional (cross.config == "x86_64-w64-mingw32") pkgs.file
;
# Cross-linking dynamic libraries, every buildInput should # Cross-linking dynamic libraries, every buildInput should
# be propagated because ld needs the -rpath-link to find # be propagated because ld needs the -rpath-link to find