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

boost: fix build on mingw after b465dc202f0b

Browse Source 
We passed bogus --libdir even in standard native builds;
apparently it wasn't a problem, but I also fixed that.
This commit is contained in:
Vladimír Čunát 2016-05-16 12:53:30 +02:00
parent 4cf524e588
commit 604b0c86bf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/boost/generic.nix
View File

@ -100,7 +100,7 @@ let
commonConfigureFlags = [ commonConfigureFlags = [
"--includedir=$(dev)/include" "--includedir=$(dev)/include"
"--libdir=$(lib)/lib" "--libdir=$(out)/lib"
]; ];
fixup = '' fixup = ''
@ -111,7 +111,7 @@ let
-exec sed '1i#line 1 "{}"' -i '{}' \; -exec sed '1i#line 1 "{}"' -i '{}' \;
) )
'' + optionalString (stdenv.cross.libc or null == "msvcrt") '' '' + optionalString (stdenv.cross.libc or null == "msvcrt") ''
${stdenv.cross.config}-ranlib "$lib"/lib/*.a ${stdenv.cross.config}-ranlib "$out"/lib/*.a
''; '';
in in