diff options
author | Gabriel Ebner <gebner@gebner.org> | 2020-07-18 18:48:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-18 18:48:12 +0200 |
commit | 3ffc16a8348ea8c9d1646fb61d34a5a35effb7eb (patch) | |
tree | 47f74140756fe249cd889e450135f57f5e771a23 /pkgs | |
parent | c28899b9c60177e2089ff563729db72ffdf9ac26 (diff) | |
parent | 424936ed33a8302a17b1f14d8cb85488d61968db (diff) |
Merge pull request #93375 from MrChico/cvc4_1.8
cvc4: 1.6 -> 1.8
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/science/logic/cvc4/default.nix | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index a6e9bc69a12c0..54a2f02255188 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, cln, gmp, swig, pkgconfig -, readline, libantlr3c, boost, jdk, autoreconfHook -, python3, antlr3_4 +{ stdenv, fetchFromGitHub, cmake, cln, gmp, git, swig, pkgconfig +, readline, libantlr3c, boost, jdk, python3, antlr3_4 }: stdenv.mkDerivation rec { pname = "cvc4"; - version = "1.6"; + version = "1.8"; - src = fetchurl { - url = "https://cvc4.cs.stanford.edu/downloads/builds/src/cvc4-${version}.tar.gz"; - sha256 = "1iw793zsi48q91lxpf8xl8lnvv0jsj4whdad79rakywkm1gbs62w"; + src = fetchFromGitHub { + owner = "cvc4"; + repo = "cvc4"; + rev = version; + sha256 = "1rhs4pvzaa1wk00czrczp58b2cxfghpsnq534m0l3snnya2958jp"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ gmp cln readline swig libantlr3c antlr3_4 boost jdk python3 ]; + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ gmp git python3.pkgs.toml cln readline swig libantlr3c antlr3_4 boost jdk python3 ]; configureFlags = [ "--enable-language-bindings=c,c++,java" "--enable-gpl" @@ -30,6 +31,10 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs ./src/ ''; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Production" + ]; + enableParallelBuilding = true; |