From 19ea87186259494b1ba4db73d4c1672a71c7e1ea Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 11 Nov 2014 10:17:08 -0500 Subject: [PATCH] boost: Fix building on Darwin --- pkgs/development/libraries/boost/generic.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index ea2710c8e564..e15b424ca339 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;