diff options
| author | Ilan Joselevich <personal@ilanjoselevich.com> | 2023-03-06 22:19:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-06 22:19:54 +0200 |
| commit | e398da146034d05a25b8e0286d866b4acdb5a23a (patch) | |
| tree | 35d02dfb06493dbeb5ada2ce9be7c681d80d570b | |
| parent | 6080aa8c9b51852142406859771bc256a95dd666 (diff) | |
| parent | 3796e5913698883eb2ef6d6cc6c797fd302a4bc4 (diff) | |
Merge pull request #219606 from wegank/vampire-aarch64
vampire: unbreak on aarch64-linux
| -rw-r--r-- | pkgs/applications/science/logic/vampire/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix index 92cad0c61e5a..253c88705aea 100644 --- a/pkgs/applications/science/logic/vampire/default.nix +++ b/pkgs/applications/science/logic/vampire/default.nix @@ -28,14 +28,12 @@ stdenv.mkDerivation rec { 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"; - }) ]; + postPatch = '' + patch -p1 -i ${../avy/minisat-fenv.patch} -d Minisat || true + ''; + enableParallelBuilding = true; fixupPhase = '' @@ -47,7 +45,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); homepage = "https://vprover.github.io/"; description = "The Vampire Theorem Prover"; platforms = platforms.unix; |