diff options
| author | Will Dietz <github@wdtz.org> | 2018-07-05 11:13:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-05 11:13:42 -0500 |
| commit | 67986382e42c444a1f49b9ac8f69754c750f3a05 (patch) | |
| tree | ba8aba9ac47937581bebd89d8e6e6eaa3a7f4743 /pkgs/applications/science/logic | |
| parent | bec83a2b9e1622659f2d2fccd29bc401fcb87915 (diff) | |
| parent | 7353d8396d339d5e44759a0d647f0dd77ef055c0 (diff) | |
| download | nixlib-67986382e42c444a1f49b9ac8f69754c750f3a05.tar nixlib-67986382e42c444a1f49b9ac8f69754c750f3a05.tar.gz nixlib-67986382e42c444a1f49b9ac8f69754c750f3a05.tar.bz2 nixlib-67986382e42c444a1f49b9ac8f69754c750f3a05.tar.lz nixlib-67986382e42c444a1f49b9ac8f69754c750f3a05.tar.xz nixlib-67986382e42c444a1f49b9ac8f69754c750f3a05.tar.zst nixlib-67986382e42c444a1f49b9ac8f69754c750f3a05.zip | |
Merge pull request #43071 from dtzWill/fix/vampire-portability
vampire: portability fixes
Diffstat (limited to 'pkgs/applications/science/logic')
| -rw-r--r-- | pkgs/applications/science/logic/vampire/default.nix | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix index 12b2a36c6eae..e05839b2a143 100644 --- a/pkgs/applications/science/logic/vampire/default.nix +++ b/pkgs/applications/science/logic/vampire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, z3, zlib, git }: +{ stdenv, fetchFromGitHub, fetchpatch, z3, zlib, git }: stdenv.mkDerivation rec { version = "4.2.2"; @@ -16,7 +16,30 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ git ]; 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 = '' rm -rf z3 |