From 2ded9f3f7b2222b8aea5e779416f8a6ed3528009 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 13 Nov 2016 14:01:01 -0500 Subject: [PATCH] coq: Improve emacs buffer handling --- pkgs/applications/science/logic/coq/default.nix | 6 +++--- 1 file 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)})) ''; };