diff options
| author | hsloan <ishaqsloan@gmail.com> | 2017-06-28 16:02:40 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 19:29:03 -0400 |
| commit | df8c390a5a9398c51d8e9651b7f856f03eb6fdac (patch) | |
| tree | 7c8d8e240686a932a192a40d4f3592353c8eaa64 /pkgs/development/libraries/boost/generic.nix | |
| parent | 67ae0f03700d1ad9a9a9f2f0812141ca8a7825f8 (diff) | |
| download | nixpkgs-df8c390a5a9398c51d8e9651b7f856f03eb6fdac.tar nixpkgs-df8c390a5a9398c51d8e9651b7f856f03eb6fdac.tar.gz nixpkgs-df8c390a5a9398c51d8e9651b7f856f03eb6fdac.tar.bz2 nixpkgs-df8c390a5a9398c51d8e9651b7f856f03eb6fdac.tar.lz nixpkgs-df8c390a5a9398c51d8e9651b7f856f03eb6fdac.tar.xz nixpkgs-df8c390a5a9398c51d8e9651b7f856f03eb6fdac.tar.zst nixpkgs-df8c390a5a9398c51d8e9651b7f856f03eb6fdac.zip | |
boost: Don't use stdenv ? cross
Diffstat (limited to 'pkgs/development/libraries/boost/generic.nix')
| -rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 14d0c251c96..9a6c5d7b413 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv -, hostPlatform +, buildPlatform, hostPlatform , toolset ? if stdenv.cc.isClang then "clang" else null , enableRelease ? true , enableDebug ? false @@ -148,13 +148,13 @@ stdenv.mkDerivation { enableParallelBuilding = true; buildInputs = [ expat zlib bzip2 libiconv ] - ++ stdenv.lib.optionals (! stdenv ? cross) [ python icu ] + ++ stdenv.lib.optionals (hostPlatform == buildPlatform) [ python icu ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; configureScript = "./bootstrap.sh"; configureFlags = commonConfigureFlags ++ [ "--with-python=${python.interpreter}" ] - ++ optional (! stdenv ? cross) "--with-icu=${icu.dev}" + ++ optional (hostPlatform == buildPlatform) "--with-icu=${icu.dev}" ++ optional (toolset != null) "--with-toolset=${toolset}"; buildPhase = builder nativeB2Args; |