public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #43071 from dtzWill/fix/vampire-portability 

vampire: portability fixes
This commit is contained in:
Will Dietz 2018-07-05 11:13:42 -05:00 committed by GitHub
parent bec83a2b9e 7353d8396d
commit 67986382e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/applications/science/logic/vampire/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, z3, zlib, git }: { stdenv, fetchFromGitHub, fetchpatch, z3, zlib, git }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "4.2.2"; version = "4.2.2";
@ -16,7 +16,30 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ git ]; nativeBuildInputs = [ git ];
buildInputs = [ z3 zlib ]; buildInputs = [ z3 zlib ];
makeFlags = [ "vampire_z3_rel" ]; makeFlags = [ "vampire_z3_rel" "CC:=$(CC)" "CXX:=$(CXX)" ];
patches = [
# https://github.com/vprover/vampire/pull/54
(fetchpatch {
name = "fix-apple-cygwin-defines.patch";
url = https://github.com/vprover/vampire/pull/54.patch;
sha256 = "0i6nrc50wlg1dqxq38lkpx4rmfb3lf7s8f95l4jkvqp0nxa20cza";
})
# https://github.com/vprover/vampire/pull/55
(fetchpatch {
name = "fix-wait-any.patch";
url = https://github.com/vprover/vampire/pull/55.patch;
sha256 = "1pwfpwpl23bqsgkmmvw6bnniyvp5j9v8l3z9s9pllfabnfcrcz9l";
})
# https://github.com/vprover/vampire/pull/56
(fetchpatch {
name = "fenv.patch";
url = https://github.com/vprover/vampire/pull/56.patch;
sha256 = "0xl3jcyqmk146mg3qj5hdd0pbja6wbq3250zmfhbxqrjh40mm40g";
})
];
enableParallelBuilding = true;
fixupPhase = '' fixupPhase = ''
rm -rf z3 rm -rf z3