about summary refs log tree commit diff
path: root/pkgs/development/libraries/valhalla/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries/valhalla/default.nix')
-rw-r--r--pkgs/development/libraries/valhalla/default.nix14
1 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/development/libraries/valhalla/default.nix b/pkgs/development/libraries/valhalla/default.nix
index 2d400d73f401..bfd23747db0a 100644
--- a/pkgs/development/libraries/valhalla/default.nix
+++ b/pkgs/development/libraries/valhalla/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , cmake
 , pkg-config
 , boost
@@ -29,6 +30,14 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
+  patches = [
+    # Fix build
+    (fetchpatch {
+      url = "https://github.com/valhalla/valhalla/commit/e4845b68e8ef8de9eabb359b23bf34c879e21f2b.patch";
+      hash = "sha256-xCufmXHGj1JxaMwm64JT9FPY+o0+x4glfJSYLdvHI8U=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace src/bindings/python/CMakeLists.txt \
       --replace "\''${Python_SITEARCH}" "${placeholder "out"}/${python3.sitePackages}"
@@ -44,6 +53,11 @@ stdenv.mkDerivation (finalAttrs: {
     "-DENABLE_BENCHMARKS=OFF"
   ];
 
+  env.NIX_CFLAGS_COMPILE = toString [
+    # Needed for date submodule with GCC 12 https://github.com/HowardHinnant/date/issues/750
+    "-Wno-error=stringop-overflow"
+  ];
+
   buildInputs = [
     boost
     curl