summary refs log tree commit diff
path: root/pkgs/development/libraries/boost/generic.nix
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2018-07-03 21:08:46 +0200
committerDaiderd Jordan <daiderd@gmail.com>2018-07-03 21:08:46 +0200
commitbce4388874bd205d45518727f2a92a142f18635b (patch)
tree68d1dfec76621bf5b1a81ce815da0714a16b183c /pkgs/development/libraries/boost/generic.nix
parent208091b31bcb15d948e2141460953e6f0ea08f5e (diff)
downloadnixpkgs-bce4388874bd205d45518727f2a92a142f18635b.tar
nixpkgs-bce4388874bd205d45518727f2a92a142f18635b.tar.gz
nixpkgs-bce4388874bd205d45518727f2a92a142f18635b.tar.bz2
nixpkgs-bce4388874bd205d45518727f2a92a142f18635b.tar.lz
nixpkgs-bce4388874bd205d45518727f2a92a142f18635b.tar.xz
nixpkgs-bce4388874bd205d45518727f2a92a142f18635b.tar.zst
nixpkgs-bce4388874bd205d45518727f2a92a142f18635b.zip
boost: disable system Python.framework detection
There doesn't seem to be a --without-python flag and since the system
framework is always available the build tries to enable python support
while we have it disabled by default and explicitly don't pass in the
python headers.
Diffstat (limited to 'pkgs/development/libraries/boost/generic.nix')
-rw-r--r--pkgs/development/libraries/boost/generic.nix12
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 34e837f7cd2..dab6fac6f0c 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -87,11 +87,13 @@ stdenv.mkDerivation {
   inherit src;
 
   patchFlags = optionalString (hostPlatform.libc == "msvcrt") "-p0";
-  patches = patches ++ optional (hostPlatform.libc == "msvcrt") (fetchurl {
-    url = "https://svn.boost.org/trac/boost/raw-attachment/tickaet/7262/"
-        + "boost-mingw.patch";
-    sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj";
-  });
+  patches = patches
+    ++ optional stdenv.isDarwin ./darwin-no-system-python.patch
+    ++ optional (hostPlatform.libc == "msvcrt") (fetchurl {
+      url = "https://svn.boost.org/trac/boost/raw-attachment/tickaet/7262/"
+          + "boost-mingw.patch";
+      sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj";
+    });
 
   meta = {
     homepage = http://boost.org/;