diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-19 09:13:54 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-19 09:13:54 +0000 |
| commit | 220273ccc689041667ab5ff55fe5b1e93689227a (patch) | |
| tree | d1c95664832920b476ab48ab5dd9ad09ec67d82d /nixpkgs/pkgs/development/libraries/boost | |
| parent | 68bab940e926ec7ae7380947a78c581e6aadcd18 (diff) | |
| parent | 6e3ee8957637a60f5072e33d78e05c0f65c54366 (diff) | |
| download | nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar.gz nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar.bz2 nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar.lz nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar.xz nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar.zst nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.zip | |
Merge commit '6e3ee8957637a60f5072e33d78e05c0f65c54366'
Conflicts: nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/boost')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/boost/generic.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/boost/generic.nix b/nixpkgs/pkgs/development/libraries/boost/generic.nix index 490693035707..bad87fba8c64 100644 --- a/nixpkgs/pkgs/development/libraries/boost/generic.nix +++ b/nixpkgs/pkgs/development/libraries/boost/generic.nix @@ -127,7 +127,14 @@ stdenv.mkDerivation { extraPrefix = "libs/context/"; }) ++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch - ++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch; + ++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch + ++ optional (version == "1.77.0") (fetchpatch { + url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; + sha256 = "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4="; + stripLen = 2; + extraPrefix = ""; + includes = [ "boost/math/special_functions/detail/bernoulli_details.hpp" ]; + }); meta = { homepage = "http://boost.org/"; |