From 8b292a1b355e8e7f6e7a2cf439ab777bdae30422 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Thu, 14 Apr 2016 08:59:47 +0200
Subject: stdenv on mingw: fix 64-bin DLL detection in some cases

In particular, this makes 64-bit libpng create DLL now,
and thus depending packages won't fail anymore (e.g. freetype).
---
 pkgs/stdenv/adapters.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'pkgs/stdenv/adapters.nix')

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 87d3938f13d3..0b6707bf8b16 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -96,8 +96,12 @@ rec {
                     name = name + "-" + cross.config;
                     nativeBuildInputs = nativeBuildInputsDrvs
                       ++ nativeInputsFromBuildInputs
-                      ++ [ gccCross binutilsCross ] ++
-                      stdenv.lib.optional selfNativeBuildInput nativeDrv;
+                      ++ [ gccCross binutilsCross ]
+                      ++ 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
                     # be propagated because ld needs the -rpath-link to find
-- 
cgit 1.4.1