b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gecode_3: fix on darwin using same patch as gecode_6

Browse source
This commit is contained in:
Robert Scott 2022-05-27 00:03:31 +01:00
parent f2366ef1e2
commit dd41e3832a
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/libraries/gecode/3.nix
View file

@ -1,4 +1,9 @@
{ lib, stdenv, fetchurl, perl }:
{ lib
, stdenv
, fetchurl
, fetchpatch
, perl
}:
stdenv.mkDerivation rec {
pname = "gecode";
@ -9,6 +14,10 @@ stdenv.mkDerivation rec {
sha256 = "0k45jas6p3cyldgyir1314ja3174sayn2h2ly3z9b4dl3368pk77";
};
patches = [
(import ./fix-const-weights-clang-patch.nix fetchpatch)
];
nativeBuildInputs = [ perl ];
preConfigure = "patchShebangs configure";

7
pkgs/development/libraries/gecode/default.nix
View file

@ -23,12 +23,7 @@ stdenv.mkDerivation rec {
};
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";
})
(import ./fix-const-weights-clang-patch.nix fetchpatch)
];
enableParallelBuilding = true;

7
pkgs/development/libraries/gecode/fix-const-weights-clang-patch.nix Normal file
View file

@ -0,0 +1,7 @@
fetchpatch:
# 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";
})