[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/06: gnu: emacs-irony-mode: Remove propagated input
From: |
guix-commits |
Subject: |
05/06: gnu: emacs-irony-mode: Remove propagated input |
Date: |
Wed, 9 Jan 2019 12:48:06 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 037c3b0ea27ff4c428f4c54dc3d04f1d341a5a27
Author: Tim Gesthuizen <address@hidden>
Date: Mon Dec 24 14:46:27 2018 +0100
gnu: emacs-irony-mode: Remove propagated input
emacs-irony-mode finds its server binary because its a propagated input and
is
in the path. We can substitute the variable `irony-server-install-prefix` to
not propagate the input and keep the binary isolated from the user.
* gnu/packages/emacs.scm (emacs-irony-mode):
[propagated-inputs] Remove propagated inputs
[inputs] Add emacs-irony-mode-server
[arguments] Add phase substituting the variable of the server path
Signed-off-by: Ludovic Courtès <address@hidden>
---
gnu/packages/emacs.scm | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 34b3086..b9d164a 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -2840,9 +2840,16 @@ These are distributed in separate files and can be used
individually.")
"0nhjrnlmss535jbshjjd30vydbr8py21vkx4p294w6d8vg2rssf8"))
(file-name (string-append name "-" version ".tar.gz"))))
(build-system emacs-build-system)
- (arguments '())
- (propagated-inputs
- `(("emacs-irony-mode-server" ,emacs-irony-mode-server)))
+ (inputs `(("server" ,emacs-irony-mode-server)))
+ (arguments `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'configure
+ (lambda* (#:key inputs #:allow-other-keys)
+ (chmod "irony.el" #o644)
+ (emacs-substitute-variables "irony.el"
+ ("irony-server-install-prefix"
+ (assoc-ref inputs "server")))
+ #t)))))
(synopsis "C/C++/ObjC Code completion and syntax checks for Emacs")
(description "Irony-mode provides Clang-assisted syntax checking and
completion for C, C++, and ObjC in GNU Emacs. Using @code{libclang} it can
@@ -2857,7 +2864,6 @@ described on the homepage.")
(name "emacs-irony-mode-server")
(inputs
`(("clang" ,clang)))
- (propagated-inputs '())
(arguments
`(#:phases
(modify-phases %standard-phases
- branch master updated (cba08f6 -> 1b504b4), guix-commits, 2019/01/09
- 02/06: gnu: bind: Update to 9.12.3-P1., guix-commits, 2019/01/09
- 03/06: gnu: e2fsprogs: Update to 1.44.5., guix-commits, 2019/01/09
- 04/06: gnu: emacs-ggtags: Don't require GNU Global in path, guix-commits, 2019/01/09
- 01/06: gnu: emacs-md4rd: Update to c55512c., guix-commits, 2019/01/09
- 05/06: gnu: emacs-irony-mode: Remove propagated input,
guix-commits <=
- 06/06: gnu: libgit2: Update to 0.27.7., guix-commits, 2019/01/09