Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 05ef70a46fe2
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2aa505b77c04
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Apr 16, 2019

  1. 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.

(cherry picked from commit 153e7fc)
    @strager @veprbl
    strager authored and veprbl committed Apr 16, 2019
    Copy the full SHA
    2aa505b View commit details
Showing with 49 additions and 1 deletion.
  1. +45 −0 pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch
  2. +4 −1 pkgs/development/libraries/boost/generic.nix
45 changes: 45 additions & 0 deletions pkgs/development/libraries/boost/darwin-1.55-no-system-python.patch
View file
Original file line number Diff line number Diff line change
@@ -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) ;

5 changes: 4 additions & 1 deletion pkgs/development/libraries/boost/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -103,7 +103,10 @@ stdenv.mkDerivation {

patchFlags = optionalString (stdenv.hostPlatform.libc == "msvcrt") "-p0";
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)
++ optional (stdenv.hostPlatform.libc == "msvcrt") (fetchurl {
url = "https://svn.boost.org/trac/boost/raw-attachment/tickaet/7262/"
+ "boost-mingw.patch";