From patchwork Sun Oct 22 17:01:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 55126 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DA25C27BBEA; Sun, 22 Oct 2023 18:02:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 22EE927BBE9 for ; Sun, 22 Oct 2023 18:02:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qubqW-0003um-90; Sun, 22 Oct 2023 13:02:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qubqU-0003oh-FA for guix-patches@gnu.org; Sun, 22 Oct 2023 13:02:34 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qubqT-00055h-Ty for guix-patches@gnu.org; Sun, 22 Oct 2023 13:02:34 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qubqw-0001z5-0W for guix-patches@gnu.org; Sun, 22 Oct 2023 13:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66685] [PATCH] gnu: xdg-utils: Add missing PATHs. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 22 Oct 2023 17:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66685 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66685@debbugs.gnu.org Cc: "Paul A. Patience" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16979941637593 (code B ref -1); Sun, 22 Oct 2023 17:03:01 +0000 Received: (at submit) by debbugs.gnu.org; 22 Oct 2023 17:02:43 +0000 Received: from localhost ([127.0.0.1]:47989 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qubqd-0001yO-7c for submit@debbugs.gnu.org; Sun, 22 Oct 2023 13:02:43 -0400 Received: from lists.gnu.org ([2001:470:142::17]:37090) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qubqY-0001y6-DP for submit@debbugs.gnu.org; Sun, 22 Oct 2023 13:02:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qubpz-0002wr-4Z for guix-patches@gnu.org; Sun, 22 Oct 2023 13:02:03 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qubpu-000521-BL for guix-patches@gnu.org; Sun, 22 Oct 2023 13:02:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1697994110; x=1698253310; bh=Zk4xWgOqufWTXDS+9Zq40Pz7cpvD9AZIm9oBo8Xod2M=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=XHtWqBH4zOP1+Vrm8tD8thOrcfqA6sfIJ+TNV8VLK9iAgkEuIAimCMcz7NqOPlai1 xavF/EAUzpirqpuDtPHPI6QPuWy7636vvYxxKl+bGcQ6ShKDm7UKYecI8ODHn4sKNC a7eitNE312yGfhkYTE/+AJIM7ID/lET6D4N24+baKsYb97IrFP6l2p1DainNQf7erQ 3wtfebXgMFNVNS4GYAssAE3eWUisVlegnLtQRRRYgfsjBGc//0qenKWnnbpwb0SSFv MbLulnDFWffoK1mxpGK+1FnbDxylBoTyC/AaKv6ifxD5lZ4y3zAlN/d0s2R6/juabe qsJigslqdd5uA== Date: Sun, 22 Oct 2023 17:01:38 +0000 From: "Paul A. Patience" Message-ID: Feedback-ID: 19227857:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.18; envelope-from=paul@apatience.com; helo=mail-4018.proton.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/freedesktop.scm (xdg-utils)[inputs]: Add which. [arguments]<#:phases>{wrap-executables}: Add xdg-utils and which to PATHs. --- gnu/packages/freedesktop.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) base-commit: fed6ac2ae182597a492b17a29ed8b26986498755 diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 648ebad408..2ad3c438dc 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -506,6 +506,7 @@ (define-public xdg-utils inetutils ;xdg-screensaver uses `hostname' perl-file-mimeinfo ;for mimeopen fallback sed + which xprop ;for Xfce detecting xset)) ;for xdg-screensaver (arguments @@ -550,18 +551,18 @@ (define-public xdg-utils (setenv "STYLESHEET" (string-append xsldoc "/html/docbook.xsl"))))) (add-after 'install 'wrap-executables - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key inputs #:allow-other-keys) (let* ((dependencies '("awk" "grep" "hostname" "ls" "mimeopen" - "sed" "xprop" "xset")) + "sed" "which" "xprop" "xset")) (pkgs (map (lambda (cmd) (search-input-file inputs (string-append "bin/" cmd))) dependencies)) - (bindirs (map dirname pkgs))) - (with-directory-excursion (string-append #$output "/bin") - (for-each (cute wrap-program <> - `("PATH" ":" prefix ,bindirs)) - (find-files "."))))))))) + (bindirs (map dirname pkgs)) + (outbin (string-append #$output "/bin"))) + (for-each (cute wrap-program <> + `("PATH" ":" prefix (,outbin ,@bindirs))) + (find-files outbin)))))))) (home-page "https://www.freedesktop.org/wiki/Software/xdg-utils/") (synopsis "Freedesktop.org scripts for desktop integration") (description "The xdg-utils package is a set of simple scripts that