cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

coq: Move dune to nativeBuildInputs and add ocaml, findlib and menhir

Browse source
This commit is contained in:
Ulrik Strid 2022-02-20 22:06:30 +01:00
parent 24102db995
commit 48df7cdbba
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/science/logic/coq/default.nix
View file

@ -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;