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

vampire: portability fixes

Browse Source 
These have been submitted upstream,
but seconds before writing this message
so naturally no upstream response "yet" :).

Regardless of response, fetch patches
from the corresponding PR's for context
and of course hopefully they'll
be included in next version.
This commit is contained in:
Will Dietz 2018-07-05 07:34:10 -05:00
parent 8e6db30bb7
commit 600abbedc9
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
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";
@ -18,6 +18,27 @@ stdenv.mkDerivation rec {
makeFlags = [ "vampire_z3_rel" "CC:=$(CC)" "CXX:=$(CXX)" ]; 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";
})
];
fixupPhase = '' fixupPhase = ''
rm -rf z3 rm -rf z3
''; '';