diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-11 10:17:08 -0500 |
|---|---|---|
| committer | administrator <administrator@administrators-Mac-mini.local> | 2014-11-11 10:17:08 -0500 |
| commit | 19ea87186259494b1ba4db73d4c1672a71c7e1ea (patch) | |
| tree | 073dda4e9c86a6ac777a0558f5af310c6718808d /pkgs/development/libraries/boost/generic.nix | |
| parent | 6985461c80838451494365da30ee30f47851cf2d (diff) | |
| download | nixpkgs-19ea87186259494b1ba4db73d4c1672a71c7e1ea.tar nixpkgs-19ea87186259494b1ba4db73d4c1672a71c7e1ea.tar.gz nixpkgs-19ea87186259494b1ba4db73d4c1672a71c7e1ea.tar.bz2 nixpkgs-19ea87186259494b1ba4db73d4c1672a71c7e1ea.tar.lz nixpkgs-19ea87186259494b1ba4db73d4c1672a71c7e1ea.tar.xz nixpkgs-19ea87186259494b1ba4db73d4c1672a71c7e1ea.tar.zst nixpkgs-19ea87186259494b1ba4db73d4c1672a71c7e1ea.zip | |
boost: Fix building on Darwin
Diffstat (limited to 'pkgs/development/libraries/boost/generic.nix')
| -rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index ea2710c8e56..e15b424ca33 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,5 +1,5 @@ { stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, makeSetupHook -, toolset ? null +, toolset ? if stdenv.isDarwin then "clang" else null , enableRelease ? true , enableDebug ? false , enableSingleThreaded ? false @@ -138,9 +138,7 @@ stdenv.mkDerivation { "--with-python=${python}/bin/python" ] ++ optional (toolset != null) "--with-toolset=${toolset}"; - buildPhase = '' - ${stdenv.lib.optionalString (toolset == "clang") "unset NIX_ENFORCE_PURITY"} - '' + builder nativeB2Args; + buildPhase = builder nativeB2Args; installPhase = installer nativeB2Args; |