diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2022-10-12 14:33:56 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2022-10-12 14:36:44 +0300 |
| commit | 322917aeb8e672c21378fd371a5cff4a9f0c2520 (patch) | |
| tree | 70229faa39f14caa09b769153453c3898f64f7fc /gnu/packages/ratpoison.scm | |
| parent | 407f017663c97ebfe48e3cb304bf97bf2557f83f (diff) | |
| parent | e1baf802ccd8af4f7b416b0987db706f2dbfc42f (diff) | |
| download | guix-322917aeb8e672c21378fd371a5cff4a9f0c2520.tar guix-322917aeb8e672c21378fd371a5cff4a9f0c2520.tar.gz | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts:
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/kde-frameworks.scm
gnu/packages/video.scm
Diffstat (limited to 'gnu/packages/ratpoison.scm')
| -rw-r--r-- | gnu/packages/ratpoison.scm | 66 |
1 files changed, 37 insertions, 29 deletions
diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm index 0c0687032d..799e4e0a8a 100644 --- a/gnu/packages/ratpoison.scm +++ b/gnu/packages/ratpoison.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2014, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> +;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,8 +20,9 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu packages ratpoison) - #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) + #:use-module (guix packages) #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:select (gpl2+)) #:use-module (gnu packages) @@ -44,42 +46,48 @@ (patches (search-patches "ratpoison-shell.patch")))) (build-system gnu-build-system) (arguments - `(#:modules ((ice-9 format) + (list + #:modules `((ice-9 format) ,@%gnu-build-system-modules) - #:phases - (modify-phases %standard-phases - (add-after 'install 'install-xsession - (lambda* (#:key outputs #:allow-other-keys) - ;; Add a .desktop file to xsessions. - (let* ((output (assoc-ref outputs "out")) - (xsessions (string-append output "/share/xsessions"))) - (mkdir-p xsessions) - (call-with-output-file (string-append xsessions - "/ratpoison.desktop") - (lambda (port) - (format port - "[Desktop Entry]~@ + ;; Specify the absolute location of xterm, as the user experience sucks + ;; when no terminal is available (can't consult help with 'C-t ?', for + ;; example). + #:configure-flags #~(list (string-append "--with-xterm=" + #$(this-package-input "xterm"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-xsession + (lambda _ + ;; Add a .desktop file to xsessions. + (let ((xsessions (string-append #$output "/share/xsessions"))) + (mkdir-p xsessions) + (call-with-output-file (string-append xsessions + "/ratpoison.desktop") + (lambda (port) + (format port + "[Desktop Entry]~@ Name=ratpoison~@ Comment=Tiling window manager: say goodbye to the rodent!~@ Exec=~a/bin/ratpoison~@ TryExec=~@*~a/bin/ratpoison~@ Type=Application~%" - output))) - #t)))))) + #$output))))))))) (inputs - `(("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("libXft" ,libxft) - ("libXi" ,libxi) - ("libxrandr" ,libxrandr) - ("libXpm" ,libxpm) - ("libXt" ,libxt) - ("libXtst" ,libxtst) - ("libX11" ,libx11) - ("readline" ,readline) - ("xorgproto" ,xorgproto))) + (list fontconfig + freetype + libxft + libxi + libxrandr + libxpm + libxt + libxtst + libx11 + readline + xorgproto + xterm)) (native-inputs - (list perl pkg-config)) + (list perl + pkg-config)) (home-page "https://www.nongnu.org/ratpoison/") (synopsis "Simple mouse-free tiling window manager") (description |