diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 18cb383651cf..822865f8866e 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -28,6 +28,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ZmHj1BSyoMBCuxI5hrRiBEb5pDUsGzis+T5FSX27UN8="; }; + patches = [ + # Pathes to fix compiling on LLVM 19 from https://github.com/ukoethe/vigra/pull/592 + ./fix-llvm-19-1.patch + ./fix-llvm-19-2.patch + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost diff --git a/pkgs/development/libraries/vigra/fix-llvm-19-1.patch b/pkgs/development/libraries/vigra/fix-llvm-19-1.patch new file mode 100644 index 000000000000..543f0752e84f --- /dev/null +++ b/pkgs/development/libraries/vigra/fix-llvm-19-1.patch @@ -0,0 +1,22 @@ +From c04362c082f35e87afbc9441dd2b3821de179055 Mon Sep 17 00:00:00 2001 +From: Lukas N Wirz +Date: Sat, 9 Nov 2024 23:15:40 +0200 +Subject: [PATCH] fix --this typo + +--- + include/vigra/multi_iterator_coupled.hxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/vigra/multi_iterator_coupled.hxx b/include/vigra/multi_iterator_coupled.hxx +index 6831dad5d..9e6ca3c62 100644 +--- a/include/vigra/multi_iterator_coupled.hxx ++++ b/include/vigra/multi_iterator_coupled.hxx +@@ -490,7 +490,7 @@ class CoupledScanOrderIterator + CoupledScanOrderIterator operator--(int) + { + CoupledScanOrderIterator res(*this); +- --this; ++ std::advance(this, -1); + return res; + } + diff --git a/pkgs/development/libraries/vigra/fix-llvm-19-2.patch b/pkgs/development/libraries/vigra/fix-llvm-19-2.patch new file mode 100644 index 000000000000..92e730655fb7 --- /dev/null +++ b/pkgs/development/libraries/vigra/fix-llvm-19-2.patch @@ -0,0 +1,22 @@ +From 191c09c2b086e1b0ab0ca1088e48e35fe492c620 Mon Sep 17 00:00:00 2001 +From: Lukas N Wirz +Date: Sun, 10 Nov 2024 16:01:46 +0200 +Subject: [PATCH] typo + +--- + include/vigra/multi_iterator_coupled.hxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/vigra/multi_iterator_coupled.hxx b/include/vigra/multi_iterator_coupled.hxx +index 9e6ca3c62..1cb401897 100644 +--- a/include/vigra/multi_iterator_coupled.hxx ++++ b/include/vigra/multi_iterator_coupled.hxx +@@ -490,7 +490,7 @@ class CoupledScanOrderIterator + CoupledScanOrderIterator operator--(int) + { + CoupledScanOrderIterator res(*this); +- std::advance(this, -1); ++ std::advance(*this, -1); + return res; + } +