diff options
| author | Ulrik Strid <ulrik.strid@outlook.com> | 2022-02-20 22:06:30 +0100 |
|---|---|---|
| committer | Ulrik Strid <ulrik.strid@outlook.com> | 2022-02-24 14:39:45 +0100 |
| commit | 48df7cdbba1811b5c4791fc80e89e2b0790adc33 (patch) | |
| tree | bc41712190caa8515a3abfca51f3aa1755a01faf /pkgs/applications/science/logic | |
| parent | 24102db995db84d1caa4cf24371b153c2023aeee (diff) | |
| download | nixpkgs-48df7cdbba1811b5c4791fc80e89e2b0790adc33.tar nixpkgs-48df7cdbba1811b5c4791fc80e89e2b0790adc33.tar.gz nixpkgs-48df7cdbba1811b5c4791fc80e89e2b0790adc33.tar.bz2 nixpkgs-48df7cdbba1811b5c4791fc80e89e2b0790adc33.tar.lz nixpkgs-48df7cdbba1811b5c4791fc80e89e2b0790adc33.tar.xz nixpkgs-48df7cdbba1811b5c4791fc80e89e2b0790adc33.tar.zst nixpkgs-48df7cdbba1811b5c4791fc80e89e2b0790adc33.zip | |
coq: Move dune to nativeBuildInputs and add ocaml, findlib and menhir
Diffstat (limited to 'pkgs/applications/science/logic')
| -rw-r--r-- | pkgs/applications/science/logic/coq/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index bdd2796addc..e9cc106017d 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -69,7 +69,9 @@ let { case = range "8.7" "8.10"; out = ocamlPackages_4_09; } { case = range "8.5" "8.6"; out = ocamlPackages_4_05; } ] ocamlPackages_4_12; - ocamlBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] + ocamlNativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] + ++ optional (versionAtLeast "8.14") ocamlPackages.dune_2; + ocamlBuildInputs = [] ++ optional (!versionAtLeast "8.10") ocamlPackages.camlp5 ++ optional (!versionAtLeast "8.13") ocamlPackages.num ++ optional (versionAtLeast "8.13") ocamlPackages.zarith; @@ -129,6 +131,7 @@ self = stdenv.mkDerivation { }; nativeBuildInputs = [ pkg-config ] + ++ ocamlNativeBuildInputs ++ optional buildIde copyDesktopItems ++ optional (buildIde && versionAtLeast "8.10") wrapGAppsHook ++ optional (!versionAtLeast "8.6") gnumake42; @@ -137,7 +140,6 @@ self = stdenv.mkDerivation { (if versionAtLeast "8.10" then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme ] else [ ocamlPackages.lablgtk ]) - ++ optional (versionAtLeast "8.14") ocamlPackages.dune_2 ; postPatch = '' @@ -168,7 +170,7 @@ self = stdenv.mkDerivation { prefixKey = "-prefix "; - buildFlags = [ "revision" "coq" "coqide" ] ++ optional (!versionAtLeast "8.14") "bin/votour"; + buildFlags = [ "revision" "coq" ] ++ optional buildIde "coqide" ++ optional (!versionAtLeast "8.14") "bin/votour"; enableParallelBuilding = true; createFindlibDestdir = true; |