diff options
| author | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-02-26 08:54:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-26 08:54:53 +0100 |
| commit | 68e4b639a3f3972aa8209a701b155dbb6fdbcbde (patch) | |
| tree | 2a1f03bb18bff6efd0fd09297dda30ea439ea11d /pkgs/applications/science/logic/coq | |
| parent | 7d3e79bedd98878074faa6e942b0946fe09eeacb (diff) | |
| parent | 7e20e9039e7f2c41d478441d0ef453a34c1ec57a (diff) | |
Merge pull request #161111 from ulrikstrid/ulrikstrid/coq-move-dune-to-native
coq: Move dune, ocaml and findlib to nativeBuildInputs
Diffstat (limited to 'pkgs/applications/science/logic/coq')
| -rw-r--r-- | pkgs/applications/science/logic/coq/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 1be25f54e1ed7..29959be2fa97a 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; @@ -79,7 +81,7 @@ self = stdenv.mkDerivation { passthru = { inherit coq-version; - inherit ocamlPackages ocamlBuildInputs; + inherit ocamlPackages ocamlBuildInputs ocamlNativeBuildInputs; # For compatibility inherit (ocamlPackages) ocaml camlp5 findlib num ; emacsBufferSetup = pkgs: '' @@ -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; |