From 8e6db30bb78233e353844fe645e87c9a8cbbb44b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 5 Jul 2018 07:27:58 -0500
Subject: [PATCH 1/3] vampire: use CC/CXX from env, instead of always g++

---
 pkgs/applications/science/logic/vampire/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix
index 12b2a36c6ea..3edb9bb0377 100644
--- a/pkgs/applications/science/logic/vampire/default.nix
+++ b/pkgs/applications/science/logic/vampire/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ git ];
   buildInputs = [ z3 zlib ];
 
-  makeFlags = [ "vampire_z3_rel" ];
+  makeFlags = [ "vampire_z3_rel" "CC:=$(CC)" "CXX:=$(CXX)" ];
 
   fixupPhase = ''
     rm -rf z3

From 600abbedc9ddf6a454347db152021c6b4b0af093 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 5 Jul 2018 07:34:10 -0500
Subject: [PATCH 2/3] vampire: portability fixes

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.
---
 .../science/logic/vampire/default.nix         | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix
index 3edb9bb0377..4f2154d2112 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";
@@ -18,6 +18,27 @@ stdenv.mkDerivation rec {
 
   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 = ''
     rm -rf z3
   '';

From 7353d8396d339d5e44759a0d647f0dd77ef055c0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 5 Jul 2018 10:13:40 -0500
Subject: [PATCH 3/3] vampire: enable parallel building

---
 pkgs/applications/science/logic/vampire/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix
index 4f2154d2112..e05839b2a14 100644
--- a/pkgs/applications/science/logic/vampire/default.nix
+++ b/pkgs/applications/science/logic/vampire/default.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  enableParallelBuilding = true;
+
   fixupPhase = ''
     rm -rf z3
   '';