diff options
| author | Cyril Cohen <cohen@crans.org> | 2021-02-19 19:34:30 +0100 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-05-12 06:11:43 +0200 |
| commit | 7e589a45ef86abf9a6a737d9730925b81ee663b4 (patch) | |
| tree | eda31fd68603f623bdbb845f091a7e1c03b663d3 /pkgs/applications/science/logic | |
| parent | a34b9c1f1cac783ca27ac2ee8bb63beb7b915287 (diff) | |
| download | nixpkgs-7e589a45ef86abf9a6a737d9730925b81ee663b4.tar nixpkgs-7e589a45ef86abf9a6a737d9730925b81ee663b4.tar.gz nixpkgs-7e589a45ef86abf9a6a737d9730925b81ee663b4.tar.bz2 nixpkgs-7e589a45ef86abf9a6a737d9730925b81ee663b4.tar.lz nixpkgs-7e589a45ef86abf9a6a737d9730925b81ee663b4.tar.xz nixpkgs-7e589a45ef86abf9a6a737d9730925b81ee663b4.tar.zst nixpkgs-7e589a45ef86abf9a6a737d9730925b81ee663b4.zip | |
coqPackages: etc
- use propagatedBuildInputs to make sure ocaml plugin stuff is in path - updated coqPackage.heq (broken url) - fixed use of `DESTDIR` and `COQMF_COQLIB` in mkCoqDerivation - adding `COQCORELIB` environement variable to put ocaml plugin files in the right place - make metaFetch available from `coqPackages`
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 c078287b85e..58edf0a0039 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -70,9 +70,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; - ocamlNativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] + ocamlNativeBuildInputs = [ ocamlPackages.ocaml ] ++ optional (coqAtLeast "8.14") ocamlPackages.dune_2; - ocamlBuildInputs = [] + ocamlBuildInputs = [ ocamlPackages.findlib ] ++ optional (!coqAtLeast "8.10") ocamlPackages.camlp5 ++ optional (!coqAtLeast "8.13") ocamlPackages.num ++ optional (coqAtLeast "8.13") ocamlPackages.zarith; @@ -136,13 +136,15 @@ self = stdenv.mkDerivation { ++ optional buildIde copyDesktopItems ++ optional (buildIde && coqAtLeast "8.10") wrapGAppsHook ++ optional (!coqAtLeast "8.6") gnumake42; - buildInputs = [ ncurses ] ++ ocamlBuildInputs + buildInputs = [ ncurses ] ++ optionals buildIde (if coqAtLeast "8.10" then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme ] else [ ocamlPackages.lablgtk ]) ; + propagatedBuildInputs = ocamlBuildInputs; + postPatch = '' UNAME=$(type -tp uname) RM=$(type -tp rm) |