diff options
| author | Janne Heß <janne@hess.ooo> | 2022-05-23 11:01:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-23 11:01:59 +0200 |
| commit | 58c2b6c527bfb4af108243ecc598801471a97df4 (patch) | |
| tree | 6846fd19e9e2fa36f5b60cad0e55f6917aed7a8c /pkgs | |
| parent | 09438ed9cefd20ae59fb1bc386fd78a9484afccd (diff) | |
| parent | 125b803e446851520a1a866cb6a657b493973673 (diff) | |
Merge pull request #173940 from risicle/ris-gecode-clang-fix
gecode_6: add patch fixing clang build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gecode/default.nix | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix index fc9835d85db5..fe13c893480c 100644 --- a/pkgs/development/libraries/gecode/default.nix +++ b/pkgs/development/libraries/gecode/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, bison, flex, perl, gmp, mpfr, enableGist ? true, qtbase }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, bison +, flex +, perl +, gmp +, mpfr +, qtbase +, enableGist ? true +}: stdenv.mkDerivation rec { pname = "gecode"; @@ -11,6 +22,15 @@ stdenv.mkDerivation rec { sha256 = "0b1cq0c810j1xr2x9y9996p894571sdxng5h74py17c6nr8c6dmk"; }; + patches = [ + # https://github.com/Gecode/gecode/pull/74 + (fetchpatch { + name = "fix-const-weights-clang.patch"; + url = "https://github.com/Gecode/gecode/commit/c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch"; + sha256 = "0270msm22q5g5sqbdh8kmrihlxnnxqrxszk9a49hdxd72736p4fc"; + }) + ]; + enableParallelBuilding = true; dontWrapQtApps = true; nativeBuildInputs = [ bison flex ]; |