From 125b803e446851520a1a866cb6a657b493973673 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 22 May 2022 01:40:27 +0100 Subject: [PATCH] gecode_6: add patch fixing clang build --- pkgs/development/libraries/gecode/default.nix | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix index fc9835d85db..fe13c893480 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 ];