me
/
guix
Archived
1
0
Fork 0
Code

gnu: xdg-utils: Use G-expression. 

* gnu/packages/freedesktop.scm (xdg-utils)[arguments]: Use gexp.
master
Marius Bakke 2022-11-18 09:58:06 +01:00 committed by Maxim Cournoyer
parent 644a019367
commit 47234c3960
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 52 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/freedesktop.scm
View File

@ -497,11 +497,12 @@ display servers. It supports many different languages and emoji.")
xprop ;for Xfce detecting xprop ;for Xfce detecting
xset)) ;for xdg-screensaver xset)) ;for xdg-screensaver
(arguments (arguments
`(#:tests? #f ;no check target (list
#:modules ((srfi srfi-26) #:tests? #f ;no check target
#:modules `((srfi srfi-26)
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-hardcoded-paths (add-after 'unpack 'patch-hardcoded-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "scripts/xdg-mime.in" (substitute* "scripts/xdg-mime.in"
@ -518,7 +519,9 @@ display servers. It supports many different languages and emoji.")
(xsldoc (search-input-directory (xsldoc (search-input-directory
native native
(string-append "xml/xsl/docbook-xsl-" (string-append "xml/xsl/docbook-xsl-"
,(package-version docbook-xsl))))) #$(package-version
(this-package-native-input
"docbook-xsl"))))))
(for-each (lambda (file) (for-each (lambda (file)
(substitute* file (substitute* file
(("http://.*/docbookx\\.dtd") (("http://.*/docbookx\\.dtd")
@ -536,15 +539,14 @@ display servers. It supports many different languages and emoji.")
(string-append xsldoc "/html/docbook.xsl"))))) (string-append xsldoc "/html/docbook.xsl")))))
(add-after 'install 'wrap-executables (add-after 'install 'wrap-executables
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((dependencies '("awk" "grep" "hostname" "ls" "mimeopen"
(dependencies '("awk" "grep" "hostname" "ls" "mimeopen"
"sed" "xprop" "xset")) "sed" "xprop" "xset"))
(pkgs (map (lambda (cmd) (pkgs (map (lambda (cmd)
(search-input-file inputs (search-input-file inputs
(string-append "bin/" cmd))) (string-append "bin/" cmd)))
dependencies)) dependencies))
(bindirs (map dirname pkgs))) (bindirs (map dirname pkgs)))
(with-directory-excursion (string-append out "/bin") (with-directory-excursion (string-append #$output "/bin")
(for-each (cute wrap-program <> (for-each (cute wrap-program <>
`("PATH" ":" prefix ,bindirs)) `("PATH" ":" prefix ,bindirs))
(find-files "."))))))))) (find-files ".")))))))))