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

boost: support libiconv, also on non-glibc platforms

Browse Source
This commit is contained in:
Vladimír Čunát 2016-02-16 20:44:54 +01:00
parent 2b0d725854
commit 1bfc3a8965
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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames { stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv
, toolset ? if stdenv.cc.isClang then "clang" else null , toolset ? if stdenv.cc.isClang then "clang" else null
, enableRelease ? true , enableRelease ? true
, enableDebug ? false , enableDebug ? false
@ -151,7 +151,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ expat zlib bzip2 ] buildInputs = [ expat zlib bzip2 libiconv ]
++ stdenv.lib.optionals (! stdenv ? cross) [ python icu ] ++ stdenv.lib.optionals (! stdenv ? cross) [ python icu ]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;