diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-16 20:44:54 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-23 10:52:07 +0200 |
| commit | 1bfc3a8965d54b88d132bf7368dac33919ba57e1 (patch) | |
| tree | ea6854fb04bed4c5ee3aaa71aeaa43f1622110f7 /pkgs/development/libraries/boost | |
| parent | 2b0d72585432832b96ed5cf117cf9035874dfce2 (diff) | |
boost: support libiconv, also on non-glibc platforms
Diffstat (limited to 'pkgs/development/libraries/boost')
| -rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 8835c58618a2..8e5579cb8ea7 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -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 , enableRelease ? true , enableDebug ? false @@ -151,7 +151,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildInputs = [ expat zlib bzip2 ] + buildInputs = [ expat zlib bzip2 libiconv ] ++ stdenv.lib.optionals (! stdenv ? cross) [ python icu ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; |