From 42d7729ac8b18983fd58ad5e99f3bbc5fcaca581 Mon Sep 17 00:00:00 2001 From: Cayetano Santos Date: Sun, 24 Aug 2025 11:53:11 +0200 Subject: [PATCH] gnu: dwm: Improve style. * gnu/packages/suckless.scm (dwm)[arguments]: Use G-Expressions. Change-Id: I744d0d5f44bbdff6e501764a3d56002d3323bac4 Signed-off-by: jgart --- gnu/packages/suckless.scm | 64 +++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 9002eaf97b394e067e722cc2d27edf7286af1d84..f5df19cada363bd656ac88a8735feb7240ab26f0 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -230,47 +230,47 @@ a custom raw video format with a simple container.") (name "dwm") (version "6.5") (source (origin - (method url-fetch) - (uri (string-append "https://dl.suckless.org/dwm/dwm-" - version ".tar.gz")) - (sha256 - (base32 "0acpl05rg6rg6nrg3rv4kp388iqzp1n6dhin30a97yzjm6zrxmr1")))) + (method url-fetch) + (uri (string-append "https://dl.suckless.org/dwm/dwm-" + version ".tar.gz")) + (sha256 + (base32 + "0acpl05rg6rg6nrg3rv4kp388iqzp1n6dhin30a97yzjm6zrxmr1")))) (build-system gnu-build-system) (arguments - `(#:tests? #f - #:make-flags (list (string-append "FREETYPEINC=" - (assoc-ref %build-inputs "freetype") - "/include/freetype2")) - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda _ - (substitute* "Makefile" (("\\$\\{CC\\}") "gcc")) - #t)) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) + (list + #:tests? #f + #:make-flags + #~(list + (string-append "FREETYPEINC=" + #$(this-package-input "freetype") + "/include/freetype2")) + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda _ + (substitute* "Makefile" (("\\$\\{CC\\}") #$(cc-for-target))))) + (replace 'install + (lambda _ (invoke "make" "install" - (string-append "DESTDIR=" out) "PREFIX=")))) - (add-after 'build '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) - (with-output-to-file - (string-append xsessions "/dwm.desktop") - (lambda _ - (format #t - "[Desktop Entry]~@ + (string-append "DESTDIR=" #$output) "PREFIX="))) + (add-after 'build 'install-xsession + (lambda _ + ;; Add a .desktop file to xsessions. + (let* ((xsessions (string-append #$output "/share/xsessions"))) + (mkdir-p xsessions) + (with-output-to-file + (string-append xsessions "/dwm.desktop") + (lambda _ + (format #t + "[Desktop Entry]~@ Name=dwm~@ Comment=Dynamic Window Manager~@ Exec=~a/bin/dwm~@ TryExec=~@*~a/bin/dwm~@ Icon=~@ Type=Application~%" - output))) - #t)))))) + #$output))))))))) (inputs (list freetype libx11 libxft libxinerama)) (home-page "https://dwm.suckless.org/")