guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/03: gnu: emacs-tramp: Improve package style.


From: guix-commits
Subject: 03/03: gnu: emacs-tramp: Improve package style.
Date: Sun, 6 Feb 2022 18:11:41 -0500 (EST)

ngz pushed a commit to branch master
in repository guix.

commit 95664bc64831b9b7b589580b2e9769fa8bc934b9
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Mon Feb 7 00:08:32 2022 +0100

    gnu: emacs-tramp: Improve package style.
    
    * gnu/packages/emacs-xyz.scm (emacs-tramp)[arguments]<#:phases>: Use
    G-expressions.  Use SEARCH-INPUT-FILE.
---
 gnu/packages/emacs-xyz.scm | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 850cb4c517..11421e0f33 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -25780,19 +25780,18 @@ well as an option for visually flashing evaluated 
s-expressions.")
         (base32 "1101nb0raiivrv1z4w442688cxj5mpf4h4zxzy6mhirgsbayk91p"))))
     (build-system emacs-build-system)
     (arguments
-     `(#:emacs ,emacs                   ;need D-Bus
-       #:phases
-       (modify-phases %standard-phases
-         ;; All but one "/bin/" directory refer to remote
-         ;; environments, which may not be Guix.  Do not patch them
-         ;; blindly.  However, local encoding shell has to be patched.
-         (replace 'patch-el-files
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((sh (assoc-ref inputs "bash"))
-                   (file "tramp.el"))
-               (emacs-substitute-variables file
-                 ("tramp-encoding-shell" (string-append sh "/bin/sh"))))
-             #t)))))
+     (list
+      #:emacs emacs                     ;need D-Bus
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; All but one "/bin/" directory refer to remote
+          ;; environments, which may not be Guix.  Do not patch them
+          ;; blindly.  However, local encoding shell has to be patched.
+          (replace 'patch-el-files
+            (lambda* (#:key inputs #:allow-other-keys)
+              (emacs-substitute-variables "tramp.el"
+                ("tramp-encoding-shell"
+                 (search-input-file inputs "/bin/sh"))))))))
     (inputs
      (list bash))
     (home-page "https://savannah.gnu.org/projects/tramp";)



reply via email to

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