summary refs log tree commit diff
path: root/pkgs/development/libraries/boost
diff options
context:
space:
mode:
authorRyan Burns <52847440+r-burns@users.noreply.github.com>2022-02-16 18:55:03 -0800
committerGitHub <noreply@github.com>2022-02-16 18:55:03 -0800
commitc827d9df00443311ced872c65044de0bc669e119 (patch)
tree421a3a353c7546035f2ebdc843d9704a6aa93617 /pkgs/development/libraries/boost
parentce7e31119cd0d8b119d3984996961747abf2f61f (diff)
parentb906464824bde6fc5e13db1f18066c4de68d25b1 (diff)
downloadnixpkgs-c827d9df00443311ced872c65044de0bc669e119.tar
nixpkgs-c827d9df00443311ced872c65044de0bc669e119.tar.gz
nixpkgs-c827d9df00443311ced872c65044de0bc669e119.tar.bz2
nixpkgs-c827d9df00443311ced872c65044de0bc669e119.tar.lz
nixpkgs-c827d9df00443311ced872c65044de0bc669e119.tar.xz
nixpkgs-c827d9df00443311ced872c65044de0bc669e119.tar.zst
nixpkgs-c827d9df00443311ced872c65044de0bc669e119.zip
Merge pull request #153143 from r-burns/boost-no-atomics
[staging] boost177: fix on platforms without atomics
Diffstat (limited to 'pkgs/development/libraries/boost')
-rw-r--r--pkgs/development/libraries/boost/generic.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 49069303570..bad87fba8c6 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/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/";