diff options
Diffstat (limited to 'pkgs/development/coq-modules')
-rw-r--r-- | pkgs/development/coq-modules/bignums/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/coq-modules/coq-ext-lib/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/coq-modules/dpdgraph/default.nix | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index 88d7e461a317..7246382c9aed 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -43,7 +43,9 @@ stdenv.mkDerivation { inherit (param) rev sha256; }; - buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ]; + buildInputs = with coq.ocamlPackages; [ ocaml findlib coq ] + ++ stdenv.lib.optional (!stdenv.lib.versionAtLeast coq.coq-version "8.10") camlp5 + ; installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 9cf30e277f3c..f24ccaf427d2 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -26,8 +26,7 @@ stdenv.mkDerivation rec { inherit (param) sha256; }; - buildInputs = with coq.ocamlPackages; [ ocaml camlp5 ]; - propagatedBuildInputs = [ coq ]; + buildInputs = [ coq ]; enableParallelBuilding = true; diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 54654f37bac8..195a1c4eada5 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -53,7 +53,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ coq ] - ++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ocamlgraph ]); + ++ (with coq.ocamlPackages; [ ocaml findlib ocamlgraph ] + ++ stdenv.lib.optional (!stdenv.lib.versionAtLeast coq.coq-version "8.10") camlp5); # dpd_compute.ml uses deprecated Pervasives.compare # Versions prior to 0.6.5 do not have the WARN_ERR build flag |