From patchwork Thu Aug 10 01:20:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juliana Sims X-Patchwork-Id: 15739 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 EC8DB27BBEA; Thu, 10 Aug 2023 02:22:26 +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 98FB427BBE2 for ; Thu, 10 Aug 2023 02:22:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qTuNI-0002fM-Tq; Wed, 09 Aug 2023 21:22:04 -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 1qTuNH-0002eq-7o for guix-patches@gnu.org; Wed, 09 Aug 2023 21:22:03 -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 1qTuNG-0007qx-Vf for guix-patches@gnu.org; Wed, 09 Aug 2023 21:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qTuNG-0001Lh-EV for guix-patches@gnu.org; Wed, 09 Aug 2023 21:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65189] [PATCH] gnu: uwufetch: Add and use missing inputs. Resent-From: Juliana Sims Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Aug 2023 01:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65189 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65189@debbugs.gnu.org Cc: ludo@gnu.org, Juliana Sims X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16916305175171 (code B ref -1); Thu, 10 Aug 2023 01:22:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Aug 2023 01:21:57 +0000 Received: from localhost ([127.0.0.1]:40751 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qTuNB-0001LL-6y for submit@debbugs.gnu.org; Wed, 09 Aug 2023 21:21:57 -0400 Received: from lists.gnu.org ([2001:470:142::17]:55998) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qTuN8-0001L5-TJ for submit@debbugs.gnu.org; Wed, 09 Aug 2023 21:21:56 -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 1qTuN3-0002eK-Gg for guix-patches@gnu.org; Wed, 09 Aug 2023 21:21:49 -0400 Received: from relay4-d.mail.gandi.net ([2001:4b98:dc4:8::224]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qTuN1-0007pG-8x; Wed, 09 Aug 2023 21:21:49 -0400 Received: by mail.gandi.net (Postfix) with ESMTPSA id 7633FE0005; Thu, 10 Aug 2023 01:21:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1691630500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KqEQ3TMnosmEyMBMVQDDzL3pGaypbDQbVcM0BqvNiH8=; b=MzdsoeEXEI+nD7eIH4zWJwxwUJhKrY7wtCklv+Y6pZruXKzjTk6npbMK+6Ha+5IDooVIvT /hkga4YSeERDiAkIYhDCDhw0g4Isq0D+VBepmrwu31FCZ1idUEyQM8vkAuJDoSWPxQIblI jpfLZ9/z91KUbzr9+qPR8EUWa+VAmpOJPKe5R4l85sLEirs3TmtTs5F7iXMLWm2lK/YZk1 AnC6/LITuWJRcJXBNwcMv1ZySemJC8h/R5jr/yZTTahqnJ946Sf+YXV5q0go9BNT4hmQFT H0OKhUx0pG7dQFoVyYEc4iBGiHv/9s258Cog4cC2cWb8vxvCMWwE7W8XS/+png== From: Juliana Sims Date: Wed, 9 Aug 2023 21:20:23 -0400 Message-ID: <1b44a2db770f4f2a956c2235ea9cba3f0d1383a9.1691630423.git.juli@incana.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <87h6p9r21j.fsf_-_@gnu.org> References: <87h6p9r21j.fsf_-_@gnu.org> MIME-Version: 1.0 X-GND-Sasl: juli@incana.org Received-SPF: pass client-ip=2001:4b98:dc4:8::224; envelope-from=juli@incana.org; helo=relay4-d.mail.gandi.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_DNSWL_LOW=-0.7, 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 Hi Ludovic, Putting the fully-qualified paths of binaries into the source like this had not occurred to me before, but it seems so obviously correct now. Thanks for suggesting it! This patch uses that technique; I'll be adding it to my bag of packaging tricks for the future as well :) Thanks, Juli * gnu/packages/admin.scm (uwufetch) [inputs]: Add missing inputs. [phases]: Use the fully-qualified paths of the input gawk and grep. --- gnu/packages/admin.scm | 7 +++++++ 1 file changed, 7 insertions(+) base-commit: 90e34d25d5e7c14b7f3293a78f3cdad676c0d035 diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 33f9b703a7..6b6b05c4a0 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4025,6 +4025,11 @@ (define-public uwufetch (delete 'configure) (add-before 'build 'patch-source-paths (lambda _ + (substitute* "fetch.c" + (("grep") + #$(file-append grep "/bin/grep")) + (("awk") + #$(file-append gawk "/bin/awk"))) (substitute* "uwufetch.c" (("(/usr(/local)?)(.*;)" all _ _ rest) (string-append #$output rest))))) @@ -4033,6 +4038,8 @@ (define-public uwufetch (lambda _ (mkdir-p (string-append #$output "/include"))))))) (inputs (list lshw + gawk + grep ;; viu XXX not yet packaged in Guix xwininfo)) (home-page "https://github.com/TheDarkBug/uwufetch")