coqPackages_8_13.smtcoq: build cvc4 with gcc10

2 files changed, 8 insertions, 7 deletions

diff --git a/pkgs/development/coq-modules/smtcoq/cvc4.nix b/pkgs/development/coq-modules/smtcoq/cvc4.nix
index 7e31ba67b4f48..cbedf1658e4e7 100644
--- a/pkgs/development/coq-modules/smtcoq/cvc4.nix
+++ b/pkgs/development/coq-modules/smtcoq/cvc4.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" ];
 
diff --git a/pkgs/development/coq-modules/smtcoq/default.nix b/pkgs/development/coq-modules/smtcoq/default.nix
index 093c1ef15d740..a09930a7c7cc1 100644
--- a/pkgs/development/coq-modules/smtcoq/default.nix
+++ b/pkgs/development/coq-modules/smtcoq/default.nix
@@ -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 {