git.iko.soy/typeable/nixpkgs
on master help sign in
boost: fix 1.55 build on macOS (#59508)

darwin-no-system-python.patch does not apply cleany on Boost 1.55's sources. Fix this patch file for Boost 1.55, making it build successfully on macOS.

commit153e7fca326bf021eb915b626a565259f10e669a authorstrager <strager.nds@gmail.com> dateTue 16 Apr 2019, 00:11 (8 years ago) parent5e199dc
2 files changed+49−1
pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch+45 pkgs/development/libraries/boost/generic.nix+4−1
pkgs/development/libraries/boost/darwin-1.55-no-system-python.patchnew file+45
@@ -0,0 +1,45 @@
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/v2/tools/python.jam
4++++ b/tools/build/v2/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+
pkgs/development/libraries/boost/generic.nix+4−1
@@ -104,7 +104,10 @@ stdenv.mkDerivation {
104104 patchFlags = "";
105105
106106 patches = patches
107− ++ optional stdenv.isDarwin ./darwin-no-system-python.patch;
107+ ++ optional stdenv.isDarwin (
108+ if version == "1.55.0"
109+ then ./darwin-1.55-no-system-python.patch
110+ else ./darwin-no-system-python.patch);
108111
109112 meta = {
110113 homepage = http://boost.org/;