coqPackages_8_13.smtcoq: build cvc4 with gcc10

main
Vincent Laporte 2 years ago committed by Vincent Laporte
parent 2f5f09e4b6
commit 91706b1a3f
  1. 9
      pkgs/development/coq-modules/smtcoq/cvc4.nix
  2. 6
      pkgs/development/coq-modules/smtcoq/default.nix

@ -1,6 +1,6 @@
{ lib, stdenv, cln, fetchurl, gmp, swig, pkg-config
, readline, libantlr3c, boost, jdk8, autoreconfHook
, python3, antlr3_4
, libantlr3c, boost, autoreconfHook
, python3
}:
stdenv.mkDerivation rec {
@ -13,13 +13,12 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ gmp readline swig libantlr3c antlr3_4 boost jdk8 python3 ]
buildInputs = [ gmp swig libantlr3c boost python3 ]
++ lib.optionals stdenv.isLinux [ cln ];
configureFlags = [
"--enable-language-bindings=c,c++,java"
"--enable-language-bindings=c"
"--enable-gpl"
"--with-readline"
"--with-boost=${boost.dev}"
] ++ lib.optionals stdenv.isLinux [ "--with-cln" ];

@ -1,4 +1,4 @@
{ lib, stdenv, pkgs, mkCoqDerivation, coq, trakt, veriT, zchaff, fetchurl, version ? null }:
{ lib, stdenv, gcc10StdenvCompat, pkgs, mkCoqDerivation, coq, trakt, veriT, zchaff, fetchurl, version ? null }:
with lib;
let
@ -10,7 +10,9 @@ let
};
meta.broken = false;
});
cvc4 = pkgs.callPackage ./cvc4.nix {};
cvc4 = pkgs.callPackage ./cvc4.nix {
stdenv = gcc10StdenvCompat;
};
in
mkCoqDerivation {

Loading…
Cancel
Save