summary refs log tree commit diff
path: root/pkgs/applications/science
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2016-11-13 14:01:01 -0500
committerShea Levy <shea@shealevy.com>2016-11-13 14:01:01 -0500
commit2ded9f3f7b2222b8aea5e779416f8a6ed3528009 (patch)
treebf2efb5694fec41457bd73fefcd556a0f7fbd5c7 /pkgs/applications/science
parentfeb8a692a17184124308409f89d4309073a63204 (diff)
downloadnixlib-2ded9f3f7b2222b8aea5e779416f8a6ed3528009.tar
nixlib-2ded9f3f7b2222b8aea5e779416f8a6ed3528009.tar.gz
nixlib-2ded9f3f7b2222b8aea5e779416f8a6ed3528009.tar.bz2
nixlib-2ded9f3f7b2222b8aea5e779416f8a6ed3528009.tar.lz
nixlib-2ded9f3f7b2222b8aea5e779416f8a6ed3528009.tar.xz
nixlib-2ded9f3f7b2222b8aea5e779416f8a6ed3528009.tar.zst
nixlib-2ded9f3f7b2222b8aea5e779416f8a6ed3528009.zip
coq: Improve emacs buffer handling
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r--pkgs/applications/science/logic/coq/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 6c4211178077..f162fe4a86ea 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -72,9 +72,9 @@ stdenv.mkDerivation {
       (when (fboundp 'get-coq-library-directory)
         (inherit-local-permanent coq-library-directory (get-coq-library-directory))
         (coq-prog-args))
-      ; Pass proof-general's coq flags to flycheck command (pretty ugly, should probably be part of PG)
-      (inherit-local-permanent flycheck-command-wrapper-function (lambda (cmd)
-        (append (funcall (default-value 'flycheck-command-wrapper-function) cmd) (coq-coqtop-prog-args coq-load-path))))
+      (mapc (lambda (arg)
+        (when (file-directory-p (concat arg "/lib/coq/${coq-version}/user-contrib"))
+          (setenv "COQPATH" (concat (getenv "COQPATH") ":" arg "/lib/coq/${coq-version}/user-contrib")))) '(${stdenv.lib.concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)}))
     '';
   };