diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-10-11 00:27:42 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-10-11 00:27:42 +0200 |
| commit | 1882368e8a3225f75f83efebc925ddc01b16d7d5 (patch) | |
| tree | 937c001d58a8c2458808d1d7221e1e08b7cd6238 /pkgs/development/coq-modules/dpdgraph/default.nix | |
| parent | db3b1c12cbb136da533ae37e7c5e83b7dec504ee (diff) | |
| parent | aabcf2d8f52c68ad37d72bf80d90608831450af5 (diff) | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development/coq-modules/dpdgraph/default.nix')
| -rw-r--r-- | pkgs/development/coq-modules/dpdgraph/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
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 |