summary refs log tree commit diff
path: root/pkgs/development/coq-modules/flocq/default.nix
diff options
context:
space:
mode:
authorCyril Cohen <cohen@crans.org>2021-02-19 19:34:30 +0100
committerVincent Laporte <vbgl@users.noreply.github.com>2022-05-25 20:00:25 +0200
commitd113661156581c835df4fe5521ffc64128772f18 (patch)
tree86aca8a3aa196d7bfc28dc28cb213262355c4c1c /pkgs/development/coq-modules/flocq/default.nix
parent41a7a6caabeed1bfd596ac7accb88a7d4e1d189a (diff)
downloadnixpkgs-d113661156581c835df4fe5521ffc64128772f18.tar
nixpkgs-d113661156581c835df4fe5521ffc64128772f18.tar.gz
nixpkgs-d113661156581c835df4fe5521ffc64128772f18.tar.bz2
nixpkgs-d113661156581c835df4fe5521ffc64128772f18.tar.lz
nixpkgs-d113661156581c835df4fe5521ffc64128772f18.tar.xz
nixpkgs-d113661156581c835df4fe5521ffc64128772f18.tar.zst
nixpkgs-d113661156581c835df4fe5521ffc64128772f18.zip
coqPackages: etc
- put `findlib` in `buildInputs` of `mkCoqDerivation` to make sure `coq` packages find their ocaml plugin dependencies,
- use `propagatedBuildInputs` to make sure ocaml plugin dependencies are 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/development/coq-modules/flocq/default.nix')
-rw-r--r--pkgs/development/coq-modules/flocq/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix
index f13aec883e7..a0f4a3ecae8 100644
--- a/pkgs/development/coq-modules/flocq/default.nix
+++ b/pkgs/development/coq-modules/flocq/default.nix
@@ -1,4 +1,4 @@
-{ lib, which, autoconf, automake,
+{ lib, bash, autoconf, automake,
   mkCoqDerivation, coq, version ? null }:
 
 with lib; mkCoqDerivation {
@@ -16,7 +16,7 @@ with lib; mkCoqDerivation {
   release."2.6.1".sha256 = "0q5a038ww5dn72yvwn5298d3ridkcngb1dik8hdyr3xh7gr5qibj";
   releaseRev = v: "flocq-${v}";
 
-  nativeBuildInputs = [ which autoconf ];
+  nativeBuildInputs = [ bash autoconf ];
   mlPlugin = true;
   useMelquiondRemake.logpath = "Flocq";