diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2024-06-18 22:26:28 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2024-06-18 23:56:19 +0200 |
| commit | fff1cc2886b1ea3213b7d1e10d83061e4c321890 (patch) | |
| tree | dea7c07215efb587a8b754a1582c3d6b5d27795d | |
| parent | e8712d609c6fc705cbb01b1cba4b8d17888951bb (diff) | |
| download | guix-fff1cc2886b1ea3213b7d1e10d83061e4c321890.tar.gz guix-fff1cc2886b1ea3213b7d1e10d83061e4c321890.zip | |
gnu: emacs-exwm: Improve package style.
* gnu/packages/emacs-xyz.scm (emacs-exwm)[arguments]: Use G-expressions.
Remove trailing #T from phases.
Change-Id: I30f95c19463e54c484f7ad4e473a934af71ff373
| -rw-r--r-- | gnu/packages/emacs-xyz.scm | 73 |
1 files changed, 36 insertions, 37 deletions
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 13035bcf4f..81df088ca8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19788,45 +19788,44 @@ It should enable you to implement low-level X11 applications.") ;; scroll-bar-mode, fringe-mode ;; x-display-pixel-width, x-display-pixel-height (arguments - `(#:emacs ,emacs - #:phases - (modify-phases %standard-phases - (add-after 'build 'install-xsession - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (xsessions (string-append out "/share/xsessions")) - (bin (string-append out "/bin")) - (exwm-executable (string-append bin "/exwm"))) - ;; Add a .desktop file to xsessions - (mkdir-p xsessions) - (mkdir-p bin) - (make-desktop-entry-file - (string-append xsessions "/exwm.desktop") - #:name ,name - #:comment ,synopsis - #:exec exwm-executable - #:try-exec exwm-executable) - ;; Add a shell wrapper to bin - (with-output-to-file exwm-executable - (lambda _ - (format #t "#!~a ~@ + (list + #:emacs emacs + #:phases + #~(modify-phases %standard-phases + (add-after 'build 'install-xsession + (lambda* (#:key inputs #:allow-other-keys) + (let* ((xsessions (string-append #$output "/share/xsessions")) + (bin (string-append #$output "/bin")) + (exwm-executable (string-append bin "/exwm"))) + ;; Add a .desktop file to xsessions + (mkdir-p xsessions) + (mkdir-p bin) + (make-desktop-entry-file + (string-append xsessions "/exwm.desktop") + #:name #$name + #:comment #$synopsis + #:exec exwm-executable + #:try-exec exwm-executable) + ;; Add a shell wrapper to bin + (with-output-to-file exwm-executable + (lambda _ + (format #t "#!~a ~@ ~a +SI:localuser:$USER ~@ exec ~a --exit-with-session ~a \"$@\" --eval '~s' ~%" - (search-input-file inputs "/bin/sh") - (search-input-file inputs "/bin/xhost") - (search-input-file inputs "/bin/dbus-launch") - (search-input-file inputs "/bin/emacs") - '(cond - ((file-exists-p "~/.exwm") - (load-file "~/.exwm")) - ((not (featurep 'exwm)) - (require 'exwm) - (require 'exwm-config) - (exwm-config-default) - (message (concat "exwm configuration not found. " - "Falling back to default configuration..."))))))) - (chmod exwm-executable #o555) - #t)))))) + (search-input-file inputs "/bin/sh") + (search-input-file inputs "/bin/xhost") + (search-input-file inputs "/bin/dbus-launch") + (search-input-file inputs "/bin/emacs") + '(cond + ((file-exists-p "~/.exwm") + (load-file "~/.exwm")) + ((not (featurep 'exwm)) + (require 'exwm) + (require 'exwm-config) + (exwm-config-default) + (message (concat "exwm configuration not found. " + "Falling back to default configuration..."))))))) + (chmod exwm-executable #o555))))))) (home-page "https://github.com/ch11ng/exwm") (description "EXWM is a full-featured tiling X window manager for Emacs built on top |