JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #38969 from vbgl/coq-findlib

Browse Source 
coq: fix installation of OCaml libraries
This commit is contained in:
Matthew Justin Bauer 2018-04-20 18:02:52 -05:00 committed by GitHub
commit 0d8e415d6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/science/logic/coq/default.nix
View File

@ -34,11 +34,9 @@ let
self = stdenv.mkDerivation { self = stdenv.mkDerivation {
name = "coq-${version}"; name = "coq-${version}";
inherit coq-version;
inherit camlp5;
inherit (ocamlPackages) ocaml;
passthru = { passthru = {
inherit (ocamlPackages) findlib num; inherit coq-version camlp5;
inherit (ocamlPackages) ocaml findlib num;
emacsBufferSetup = pkgs: '' emacsBufferSetup = pkgs: ''
; Propagate coq paths to children ; Propagate coq paths to children
(inherit-local-permanent coq-prog-name "${self}/bin/coqtop") (inherit-local-permanent coq-prog-name "${self}/bin/coqtop")
@ -125,8 +123,11 @@ self = stdenv.mkDerivation {
buildFlags = "revision coq coqide bin/votour"; buildFlags = "revision coq coqide bin/votour";
createFindlibDestdir = true;
postInstall = '' postInstall = ''
cp bin/votour $out/bin/ cp bin/votour $out/bin/
ln -s $out/lib/coq $OCAMLFIND_DESTDIR/coq
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {