mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-01-23 10:47:24 +01:00
gnu: clipmenu: Improve package style.
* gnu/packages/xdisorg.scm (clipmenu)[arguments]: Use g-expressions; remove trailing #t from phases.
This commit is contained in:
parent
3efd1ce0b5
commit
15bab8f1f7
1 changed files with 44 additions and 47 deletions
|
@ -2891,53 +2891,50 @@ (define-public clipmenu
|
||||||
"1403sw49ccb8xsd8v611fzp0csaglfz8nmz3wcjsk8x11h9jvxwy"))))
|
"1403sw49ccb8xsd8v611fzp0csaglfz8nmz3wcjsk8x11h9jvxwy"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases
|
(list
|
||||||
(modify-phases %standard-phases
|
#:phases
|
||||||
(delete 'configure)
|
#~(modify-phases %standard-phases
|
||||||
(delete 'build)
|
(delete 'configure)
|
||||||
(replace 'install
|
(delete 'build)
|
||||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
(replace 'install
|
||||||
(let* ((out (assoc-ref outputs "out"))
|
(lambda _
|
||||||
(bin (string-append out "/bin"))
|
(let ((bin (string-append #$output "/bin"))
|
||||||
(doc (string-append %output "/share/doc/"
|
(doc (string-append #$output "/share/doc/"
|
||||||
,name "-" ,version)))
|
#$name "-" #$version)))
|
||||||
(install-file "clipdel" bin)
|
(install-file "clipdel" bin)
|
||||||
(install-file "clipmenu" bin)
|
(install-file "clipmenu" bin)
|
||||||
(install-file "clipmenud" bin)
|
(install-file "clipmenud" bin)
|
||||||
(install-file "clipfsck" bin)
|
(install-file "clipfsck" bin)
|
||||||
(install-file "clipctl" bin)
|
(install-file "clipctl" bin)
|
||||||
(install-file "README.md" doc)
|
(install-file "README.md" doc))))
|
||||||
#t)))
|
(add-after 'install 'wrap-script
|
||||||
(add-after 'install 'wrap-script
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
(let* ((out (assoc-ref outputs "out"))
|
||||||
(let* ((out (assoc-ref outputs "out"))
|
(clipnotify (assoc-ref inputs "clipnotify"))
|
||||||
(clipnotify (assoc-ref inputs "clipnotify"))
|
(coreutils-minimal (assoc-ref inputs "coreutils-minimal"))
|
||||||
(coreutils-minimal (assoc-ref inputs "coreutils-minimal"))
|
(gawk (assoc-ref inputs "gawk"))
|
||||||
(gawk (assoc-ref inputs "gawk"))
|
(util-linux (assoc-ref inputs "util-linux"))
|
||||||
(util-linux (assoc-ref inputs "util-linux"))
|
(xdotool (assoc-ref inputs "xdotool"))
|
||||||
(xdotool (assoc-ref inputs "xdotool"))
|
(xsel (assoc-ref inputs "xsel"))
|
||||||
(xsel (assoc-ref inputs "xsel"))
|
(guile (search-input-file inputs "bin/guile")))
|
||||||
(guile (search-input-file inputs "bin/guile")))
|
(for-each
|
||||||
(for-each
|
(lambda (prog)
|
||||||
(lambda (prog)
|
(wrap-script (string-append out "/bin/" prog)
|
||||||
(wrap-script (string-append out "/bin/" prog)
|
#:guile guile
|
||||||
#:guile guile
|
`("PATH" ":" prefix
|
||||||
`("PATH" ":" prefix
|
,(map (lambda (dir)
|
||||||
,(map (lambda (dir)
|
(string-append dir "/bin"))
|
||||||
(string-append dir "/bin"))
|
(list clipnotify coreutils-minimal
|
||||||
(list clipnotify coreutils-minimal
|
gawk util-linux xdotool xsel)))))
|
||||||
gawk util-linux xdotool xsel)))))
|
'("clipmenu" "clipmenud" "clipdel" "clipfsck" "clipctl")))))
|
||||||
'("clipmenu" "clipmenud" "clipdel" "clipfsck" "clipctl")))
|
(replace 'check
|
||||||
#t))
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||||
(replace 'check
|
;; substitute a shebang appearing inside a string (the test
|
||||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
;; file writes this string to a temporary file):
|
||||||
;; substitute a shebang appearing inside a string (the test
|
(substitute* "tests/test-clipmenu"
|
||||||
;; file writes this string to a temporary file):
|
(("#!/usr/bin/env bash")
|
||||||
(substitute* "tests/test-clipmenu"
|
(string-append "#!" (which "bash"))))
|
||||||
(("#!/usr/bin/env bash")
|
(invoke "tests/test-clipmenu"))))))
|
||||||
(string-append "#!" (which "bash"))))
|
|
||||||
(invoke "tests/test-clipmenu")
|
|
||||||
#t)))))
|
|
||||||
(inputs
|
(inputs
|
||||||
(list clipnotify
|
(list clipnotify
|
||||||
coreutils-minimal
|
coreutils-minimal
|
||||||
|
|
Loading…
Reference in a new issue