tjh.dev
fork
Configure Feed
Select the types of activity you want to include in your feed.
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
fork
Configure Feed
Select the types of activity you want to include in your feed.
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.
+52
-5
+45
pkgs/development/libraries/boost/darwin-no-system-python.patch
+45
pkgs/development/libraries/boost/darwin-no-system-python.patch
···
1
+
diff --git a/tools/build/src/tools/python.jam b/tools/build/src/tools/python.jam
2
+
index 273b28a..2d2031e 100644
3
+
--- a/tools/build/src/tools/python.jam
4
+
+++ b/tools/build/src/tools/python.jam
5
+
@@ -428,13 +428,7 @@ local rule windows-installed-pythons ( version ? )
6
+
7
+
local rule darwin-installed-pythons ( version ? )
8
+
{
9
+
- version ?= $(.version-countdown) ;
10
+
-
11
+
- local prefix
12
+
- = [ GLOB /System/Library/Frameworks /Library/Frameworks
13
+
- : Python.framework ] ;
14
+
-
15
+
- return $(prefix)/Versions/$(version)/bin/python ;
16
+
+ return ;
17
+
}
18
+
19
+
20
+
@@ -890,25 +884,6 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? :
21
+
22
+
# See if we can find a framework directory on darwin.
23
+
local framework-directory ;
24
+
- if $(target-os) = darwin
25
+
- {
26
+
- # Search upward for the framework directory.
27
+
- local framework-directory = $(libraries[-1]) ;
28
+
- while $(framework-directory:D=) && $(framework-directory:D=) != Python.framework
29
+
- {
30
+
- framework-directory = $(framework-directory:D) ;
31
+
- }
32
+
-
33
+
- if $(framework-directory:D=) = Python.framework
34
+
- {
35
+
- debug-message framework directory is \"$(framework-directory)\" ;
36
+
- }
37
+
- else
38
+
- {
39
+
- debug-message "no framework directory found; using library path" ;
40
+
- framework-directory = ;
41
+
- }
42
+
- }
43
+
44
+
local dll-path = $(libraries) ;
45
+
+7
-5
pkgs/development/libraries/boost/generic.nix
+7
-5
pkgs/development/libraries/boost/generic.nix
···
87
87
inherit src;
88
88
89
89
patchFlags = optionalString (hostPlatform.libc == "msvcrt") "-p0";
90
-
patches = patches ++ optional (hostPlatform.libc == "msvcrt") (fetchurl {
91
-
url = "https://svn.boost.org/trac/boost/raw-attachment/tickaet/7262/"
92
-
+ "boost-mingw.patch";
93
-
sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj";
94
-
});
90
+
patches = patches
91
+
++ optional stdenv.isDarwin ./darwin-no-system-python.patch
92
+
++ optional (hostPlatform.libc == "msvcrt") (fetchurl {
93
+
url = "https://svn.boost.org/trac/boost/raw-attachment/tickaet/7262/"
94
+
+ "boost-mingw.patch";
95
+
sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj";
96
+
});
95
97
96
98
meta = {
97
99
homepage = http://boost.org/;