[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#39102] [PATCH 1/2] gnu: xdg-utils: Don't use propagated inputs.
From: |
Jakub Kądziołka |
Subject: |
[bug#39102] [PATCH 1/2] gnu: xdg-utils: Don't use propagated inputs. |
Date: |
Sun, 12 Jan 2020 16:43:53 +0100 |
* gnu/packages/freedesktop.scm (xdg-utils)
[propagated-inputs, inputs]: Add awk, coreutils, grep, inetutils and
sed; make the dependencies not propagated.
[arguments](patch-hardcoded-paths): Move to after 'install to make
wrap-program function correctly. Wrap the installed programs.
---
gnu/packages/freedesktop.scm | 43 +++++++++++++++++++++++++++---------
1 file changed, 33 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 7066685dee..06006ed53d 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -16,6 +16,7 @@
;;; Copyright © 2018 Stefan Stefanović <address@hidden>
;;; Copyright © 2019 Reza Alizadeh Majd <address@hidden>
;;; Copyright © 2019 Guillaume Le Vaillant <address@hidden>
+;;; Copyright © 2020 Jakub Kądziołka <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -47,6 +48,7 @@
#:use-module (gnu packages acl)
#:use-module (gnu packages admin)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
@@ -55,6 +57,7 @@
#:use-module (gnu packages disk)
#:use-module (gnu packages docbook)
#:use-module (gnu packages documentation)
+ #:use-module (gnu packages gawk)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
@@ -107,20 +110,40 @@
("libxslt" ,libxslt)
("w3m" ,w3m)
("xmlto" ,xmlto)))
- (propagated-inputs
- `(("perl-file-mimeinfo" ,perl-file-mimeinfo) ; for mimeopen fallback
- ("xprop" ,xprop) ; for Xfce detecting
- ("xset" ,xset))) ; for xdg-screensaver
+ (inputs
+ `(("PATH:awk" ,gawk)
+ ("PATH:coreutils" ,coreutils)
+ ("PATH:grep" ,grep)
+ ("PATH:inetutils" ,inetutils) ; xdg-screensaver uses `hostname'
+ ("PATH:perl-file-mimeinfo" ,perl-file-mimeinfo) ; for mimeopen fallback
+ ("PATH:sed" ,sed)
+ ("PATH:xprop" ,xprop) ; for Xfce detecting
+ ("PATH:xset" ,xset))) ; for xdg-screensaver
(arguments
`(#:tests? #f ; no check target
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch-hardcoded-paths
- (lambda _
- (substitute* "scripts/xdg-mime.in"
- (("/usr/bin/file") (which "file")))
- (substitute* "scripts/xdg-open.in"
- (("/usr/bin/printf") (which "printf")))
+ (add-after 'install 'patch-hardcoded-paths
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (with-directory-excursion (string-append (assoc-ref outputs "out")
+ "/bin")
+ (substitute* "xdg-mime"
+ (("/usr/bin/file") (which "file")))
+ (substitute* "xdg-open"
+ (("/usr/bin/printf") (which "printf")))
+ (let ((path-ext
+ (map (lambda (package)
+ (string-append package "/bin"))
+ (cons (assoc-ref outputs "out")
+ (map cdr
+ (filter (lambda (package)
+ (string-prefix? "PATH:" (car
package)))
+ inputs))))))
+ (for-each
+ (lambda (script)
+ (wrap-program script
+ `("PATH" ":" prefix ,path-ext)))
+ (find-files "."))))
#t))
(add-before 'build 'locate-catalog-files
(lambda* (#:key inputs #:allow-other-keys)
--
2.24.1
- [bug#39102] [PATCH 1/2] gnu: xdg-utils: Don't use propagated inputs.,
Jakub Kądziołka <=