From 22e32f5642a58aa3ff552f526303f96d96c7e89c Mon Sep 17 00:00:00 2001 From: Cayetano Santos Date: Sun, 24 Aug 2025 12:58:41 +0200 Subject: [PATCH] gnu: tabbed: Improve style. * gnu/packages/suckless.scm (tabbed)[arguments]: Use G-Expressions. [inputs]: Modernize style. Change-Id: I54f0d10e5d3901adb23ed0abc4cbbb35ac9d7ca0 Signed-off-by: jgart --- gnu/packages/suckless.scm | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index e82cae4f6d3d687c6f7820a1bb24d78ca8a9dbc7..acbfab84485c9f91545e32f05617df68f214e182 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -107,27 +107,26 @@ terminal like @code{st}.") (base32 "0hhwckyzvsj9aim2l6m69wmvl2n7gzd6b1ly8qjnlpgcrcxfllbn")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no check target - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "config.mk" - (("/usr/local") - (assoc-ref outputs "out")) - (("/usr/X11R6") - (assoc-ref inputs "libx11")) - (("/usr/include/freetype2") - (string-append (assoc-ref inputs "freetype") - "/include/freetype2")) - (("CC = cc") - (string-append "CC = " ,(cc-for-target)))))) - (delete 'configure)))) ; no configure script + (list + #:tests? #f ; no check target + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "config.mk" + (("/usr/local") #$output) + (("/usr/X11R6") #$(this-package-input "libx11")) + (("/usr/include/freetype2") + (string-append #$(this-package-input "freetype") + "/include/freetype2")) + (("CC = cc") + (string-append "CC = " #$(cc-for-target)))))) + (delete 'configure)))) ; no configure script (inputs - `(("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("libx11" ,libx11) - ("libxft" ,libxft))) + (list fontconfig + freetype + libx11 + libxft)) (home-page "https://tools.suckless.org/tabbed/") (synopsis "Tab interface for application supporting Xembed") (description "Tabbed is a generic tabbed frontend to xembed-aware