mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-22 13:08:39 +03:00
Merge pull request #174818 from risicle/ris-gecode-3-darwin-fix
gecode_3: fix on darwin using same patch as gecode_6
This commit is contained in:
commit
fb3b007938
@ -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";
|
||||
|
@ -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;
|
||||
|
@ -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";
|
||||
})
|
Loading…
Reference in New Issue
Block a user