[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/07: gnu: xdg-utils: Don't use propagated inputs.
From: |
guix-commits |
Subject: |
07/07: gnu: xdg-utils: Don't use propagated inputs. |
Date: |
Sun, 12 Jan 2020 14:34:13 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit 2e4bb89354d909b661208b3900abfeaa621a1582
Author: Jakub Kądziołka <address@hidden>
AuthorDate: Sun Jan 12 18:03:12 2020 +0100
gnu: xdg-utils: Don't use propagated inputs.
* gnu/packages/freedesktop.scm (xdg-utils)[propagated-inputs]: Remove.
[inputs]: Add awk, coreutils, grep, inetutils, perl-file-mimeinfo and sed.
[arguments]: Wrap the installed programs with the specified inputs in PATH.
Signed-off-by: Marius Bakke <address@hidden>
---
gnu/packages/freedesktop.scm | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 7066685..ed22143 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,12 +110,19 @@
("libxslt" ,libxslt)
("w3m" ,w3m)
("xmlto" ,xmlto)))
- (propagated-inputs
- `(("perl-file-mimeinfo" ,perl-file-mimeinfo) ; for mimeopen fallback
+ (inputs
+ `(("awk" ,gawk)
+ ("coreutils" ,coreutils)
+ ("grep" ,grep)
+ ("inetutils" ,inetutils) ; xdg-screensaver uses `hostname'
+ ("perl-file-mimeinfo" ,perl-file-mimeinfo) ; for mimeopen fallback
+ ("sed" ,sed)
("xprop" ,xprop) ; for Xfce detecting
("xset" ,xset))) ; for xdg-screensaver
(arguments
`(#:tests? #f ; no check target
+ #:modules ((srfi srfi-26)
+ ,@%gnu-build-system-modules)
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-hardcoded-paths
@@ -144,6 +154,21 @@
"/manpages/docbook.xsl man")))
(setenv "STYLESHEET"
(string-append xsldoc "/html/docbook.xsl"))
+ #t)))
+ (add-after 'install 'wrap-executables
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (with-directory-excursion (string-append out "/bin")
+ (let ((path-ext
+ (map (cute string-append <> "/bin")
+ (cons out
+ (map (cute assoc-ref inputs <>)
+ '("awk" "coreutils" "grep" "inetutils"
+ "perl-file-mimeinfo" "sed" "xprop"
+ "xset"))))))
+ (for-each (cute wrap-program <>
+ `("PATH" ":" prefix ,path-ext))
+ (find-files "."))))
#t))))))
(home-page "https://www.freedesktop.org/wiki/Software/xdg-utils/")
(synopsis "Freedesktop.org scripts for desktop integration")
- branch master updated (cfd0fd9 -> 2e4bb89), guix-commits, 2020/01/12
- 01/07: gnu: chez-scheme: Remove obsolete snippet., guix-commits, 2020/01/12
- 04/07: gnu: wavpack: Do not build the static library., guix-commits, 2020/01/12
- 05/07: gnu: gst-plugins-base: Do not propagate Orc on armhf systems., guix-commits, 2020/01/12
- 06/07: gnu: nss-certs: Update to 3.48., guix-commits, 2020/01/12
- 02/07: gnu: jsoncpp: Fix test failure on armhf-linux and aarch64-linux., guix-commits, 2020/01/12
- 03/07: gnu: wavpack: Update to 5.2.0., guix-commits, 2020/01/12
- 07/07: gnu: xdg-utils: Don't use propagated inputs.,
guix-commits <=