mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-11 04:05:40 +03:00
vigra: Fix compiling on LLVM 19
This commit is contained in:
parent
dad5644331
commit
23baba69f6
3 changed files with 50 additions and 0 deletions
|
@ -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
|
||||
|
|
22
pkgs/development/libraries/vigra/fix-llvm-19-1.patch
Normal file
22
pkgs/development/libraries/vigra/fix-llvm-19-1.patch
Normal file
|
@ -0,0 +1,22 @@
|
|||
From c04362c082f35e87afbc9441dd2b3821de179055 Mon Sep 17 00:00:00 2001
|
||||
From: Lukas N Wirz <lnwirz@chem.helsinki.fi>
|
||||
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<N, HANDLES, 0>
|
||||
CoupledScanOrderIterator operator--(int)
|
||||
{
|
||||
CoupledScanOrderIterator res(*this);
|
||||
- --this;
|
||||
+ std::advance(this, -1);
|
||||
return res;
|
||||
}
|
||||
|
22
pkgs/development/libraries/vigra/fix-llvm-19-2.patch
Normal file
22
pkgs/development/libraries/vigra/fix-llvm-19-2.patch
Normal file
|
@ -0,0 +1,22 @@
|
|||
From 191c09c2b086e1b0ab0ca1088e48e35fe492c620 Mon Sep 17 00:00:00 2001
|
||||
From: Lukas N Wirz <lnwirz@chem.helsinki.fi>
|
||||
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<N, HANDLES, 0>
|
||||
CoupledScanOrderIterator operator--(int)
|
||||
{
|
||||
CoupledScanOrderIterator res(*this);
|
||||
- std::advance(this, -1);
|
||||
+ std::advance(*this, -1);
|
||||
return res;
|
||||
}
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue