From 77d45ef963f962a9351a196dbd46cd0d2b805a20 Mon Sep 17 00:00:00 2001 From: Timo Wilken Date: Sun, 4 Jun 2023 23:53:10 +0200 Subject: Format and lint xcwd package Also, replace extra build phase with setting `#:make-flags' instead, using undocumented(?) `%output' variable, as done in Guix itself for other packages. --- tw/packages/xorg.scm | 65 +++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 34 deletions(-) diff --git a/tw/packages/xorg.scm b/tw/packages/xorg.scm index 748c0503..900b6218 100644 --- a/tw/packages/xorg.scm +++ b/tw/packages/xorg.scm @@ -8,37 +8,34 @@ (define-public xcwd (package - (name "xcwd") - (version "1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/schischi/xcwd") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 (base32 "02i1149nn7ccshggqra6865jx1ayv6n4q4cdqypl1rs8m0gzbbrk")))) - (build-system gnu-build-system) - (arguments - '(#:tests? #f ; no tests defined - #:phases - (modify-phases %standard-phases - (delete 'configure) ; there is no ./configure - (add-before 'build 'set-prefix-in-makefile - (lambda* (#:key outputs #:allow-other-keys) - ;; Modify the makefile so that its 'prefix' variable points to "out". - (substitute* "Makefile" - (("prefix=.*") - (string-append "prefix=" (assoc-ref outputs "out") "\n"))))) - (add-before 'install 'create-bin-directory - (lambda* (#:key outputs #:allow-other-keys) - ;; The Makefile assumes that $(prefix)/bin already exists. - (mkdir-p (string-append (assoc-ref outputs "out") "/bin"))))))) - (inputs (list libx11)) - (home-page "https://github.com/schischi/xcwd") - (synopsis "A simple tool that prints the current working directory of the currently focused window") - (description "\ -xcwd is a simple tool that prints the current working directory of the -currently focused window. The main goal is to launch applications -directly into the same directory as the focused applications. This is -especially useful to open a new terminal or a file explorer.") - (license license:bsd-3))) + (name "xcwd") + (version "1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/schischi/xcwd") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02i1149nn7ccshggqra6865jx1ayv6n4q4cdqypl1rs8m0gzbbrk")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ;no tests defined + #:make-flags (list (string-append "prefix=" %output)) + #:phases (modify-phases %standard-phases + (delete 'configure) ;there is no ./configure + (add-before 'install 'create-bin-directory + (lambda* (#:key outputs #:allow-other-keys) + ;; The Makefile assumes that $(prefix)/bin already exists. + (mkdir-p (string-append (assoc-ref outputs "out") "/bin"))))))) + (inputs (list libx11)) + (home-page "https://github.com/schischi/xcwd") + (synopsis + "Print the current working directory of the currently focused window") + (description + "xcwd is a simple tool that prints the current working directory of the +currently focused window. The main goal is to launch applications directly +into the same directory as the focused applications. This is especially +useful to open a new terminal or a file explorer.") + (license license:bsd-3))) -- cgit v1.2.3