diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-04-20 18:02:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-20 18:02:52 -0500 |
| commit | 0d8e415d6bf904fc0316f0f860c06c9c5e31b13e (patch) | |
| tree | 296d4be66903394ef74b870338ff3ceae0f2ce2d /pkgs/applications/science/logic | |
| parent | 780558a7ea3b6fc7007a3516a9f9c520402b7535 (diff) | |
| parent | caec7dbb9fe4efced4d35c5496e592396bbb1b06 (diff) | |
| download | nixlib-0d8e415d6bf904fc0316f0f860c06c9c5e31b13e.tar nixlib-0d8e415d6bf904fc0316f0f860c06c9c5e31b13e.tar.gz nixlib-0d8e415d6bf904fc0316f0f860c06c9c5e31b13e.tar.bz2 nixlib-0d8e415d6bf904fc0316f0f860c06c9c5e31b13e.tar.lz nixlib-0d8e415d6bf904fc0316f0f860c06c9c5e31b13e.tar.xz nixlib-0d8e415d6bf904fc0316f0f860c06c9c5e31b13e.tar.zst nixlib-0d8e415d6bf904fc0316f0f860c06c9c5e31b13e.zip | |
Merge pull request #38969 from vbgl/coq-findlib
coq: fix installation of OCaml libraries
Diffstat (limited to 'pkgs/applications/science/logic')
| -rw-r--r-- | pkgs/applications/science/logic/coq/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index b989b1eb9748..2b35c91d10c4 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -34,11 +34,9 @@ let self = stdenv.mkDerivation { name = "coq-${version}"; - inherit coq-version; - inherit camlp5; - inherit (ocamlPackages) ocaml; passthru = { - inherit (ocamlPackages) findlib num; + inherit coq-version camlp5; + inherit (ocamlPackages) ocaml findlib num; emacsBufferSetup = pkgs: '' ; Propagate coq paths to children (inherit-local-permanent coq-prog-name "${self}/bin/coqtop") @@ -125,8 +123,11 @@ self = stdenv.mkDerivation { buildFlags = "revision coq coqide bin/votour"; + createFindlibDestdir = true; + postInstall = '' cp bin/votour $out/bin/ + ln -s $out/lib/coq $OCAMLFIND_DESTDIR/coq ''; meta = with stdenv.lib; { |