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/development/libraries/boost/generic.nix | |
| 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/development/libraries/boost/generic.nix')
| -rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 5 |
1 files changed, 4 insertions, 1 deletions
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/; |