diff options
| author | strager <strager.nds@gmail.com> | 2019-04-16 00:11:01 -0700 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-04-16 03:11:01 -0400 |
| commit | 153e7fca326bf021eb915b626a565259f10e669a (patch) | |
| tree | a531b9bb515400f257ee65988c388032912474a9 /pkgs | |
| parent | 5e199dc3f9299f6edb727583bf80aedd4a30f5b0 (diff) | |
| download | nixpkgs-153e7fca326bf021eb915b626a565259f10e669a.tar nixpkgs-153e7fca326bf021eb915b626a565259f10e669a.tar.gz nixpkgs-153e7fca326bf021eb915b626a565259f10e669a.tar.bz2 nixpkgs-153e7fca326bf021eb915b626a565259f10e669a.tar.lz nixpkgs-153e7fca326bf021eb915b626a565259f10e669a.tar.xz nixpkgs-153e7fca326bf021eb915b626a565259f10e669a.tar.zst nixpkgs-153e7fca326bf021eb915b626a565259f10e669a.zip | |
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.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch | 45 | ||||
| -rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 5 |
2 files changed, 49 insertions, 1 deletions
diff --git a/pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch b/pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch new file mode 100644 index 00000000000..f8163f6d271 --- /dev/null +++ b/pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch @@ -0,0 +1,45 @@ +diff --git a/tools/build/src/tools/python.jam b/tools/build/src/tools/python.jam +index 273b28a..2d2031e 100644 +--- a/tools/build/v2/tools/python.jam ++++ b/tools/build/v2/tools/python.jam +@@ -428,13 +428,7 @@ local rule windows-installed-pythons ( version ? ) + + local rule darwin-installed-pythons ( version ? ) + { +- version ?= $(.version-countdown) ; +- +- local prefix +- = [ GLOB /System/Library/Frameworks /Library/Frameworks +- : Python.framework ] ; +- +- return $(prefix)/Versions/$(version)/bin/python ; ++ return ; + } + + +@@ -890,25 +884,6 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : + + # See if we can find a framework directory on darwin. + local framework-directory ; +- if $(target-os) = darwin +- { +- # Search upward for the framework directory. +- local framework-directory = $(libraries[-1]) ; +- while $(framework-directory:D=) && $(framework-directory:D=) != Python.framework +- { +- framework-directory = $(framework-directory:D) ; +- } +- +- if $(framework-directory:D=) = Python.framework +- { +- debug-message framework directory is \"$(framework-directory)\" ; +- } +- else +- { +- debug-message "no framework directory found; using library path" ; +- framework-directory = ; +- } +- } + + local dll-path = $(libraries) ; + diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index dd383bd0123..8ce44b878d0 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -104,7 +104,10 @@ stdenv.mkDerivation { patchFlags = ""; patches = patches - ++ optional stdenv.isDarwin ./darwin-no-system-python.patch; + ++ optional stdenv.isDarwin ( + if version == "1.55.0" + then ./darwin-1.55-no-system-python.patch + else ./darwin-no-system-python.patch); meta = { homepage = http://boost.org/; |