[Top][All Lists]

[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 
    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 
               (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")
      `(("clang" ,clang)))
-    (propagated-inputs '())
        (modify-phases %standard-phases

reply via email to

[Prev in Thread] Current Thread [Next in Thread]