From 604b0c86bf402039f5d7e7b969153df42ee02c57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 16 May 2016 12:53:30 +0200 Subject: [PATCH] boost: fix build on mingw after b465dc202f0b We passed bogus --libdir even in standard native builds; apparently it wasn't a problem, but I also fixed that. --- pkgs/development/libraries/boost/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 73499a424978..335bc1b68c67 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -100,7 +100,7 @@ let commonConfigureFlags = [ "--includedir=$(dev)/include" - "--libdir=$(lib)/lib" + "--libdir=$(out)/lib" ]; fixup = '' @@ -111,7 +111,7 @@ let -exec sed '1i#line 1 "{}"' -i '{}' \; ) '' + optionalString (stdenv.cross.libc or null == "msvcrt") '' - ${stdenv.cross.config}-ranlib "$lib"/lib/*.a + ${stdenv.cross.config}-ranlib "$out"/lib/*.a ''; in