From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 09 21:21:57 2023 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: uwufetch: Add and use missing inputs. 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: 0.6 (/) X-Debbugs-Envelope-To: submit Cc: ludo@gnu.org, Juliana Sims X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.4 (/) 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(+) 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") base-commit: 90e34d25d5e7c14b7f3293a78f3cdad676c0d035 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 09 22:35:01 2023 Received: (at 65189-done) by debbugs.gnu.org; 10 Aug 2023 02:35:01 +0000 Received: from localhost ([127.0.0.1]:40769 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qTvVt-0003Cs-Ay for submit@debbugs.gnu.org; Wed, 09 Aug 2023 22:35:01 -0400 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:42097) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qTvVq-0003Ca-O3 for 65189-done@debbugs.gnu.org; Wed, 09 Aug 2023 22:35:00 -0400 Received: by mail.gandi.net (Postfix) with ESMTPSA id D9D64FF804 for <65189-done@debbugs.gnu.org>; Thu, 10 Aug 2023 02:34:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1691634891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=8WVkSF79YwlNq3AN2kDk0ArnO3ZzNVDkHlLFD+CGfDY=; b=Sm6nX/FDjPgsP49znP74yWxUSZAhSWsQxsaEkitE+G/MQRrI6A9EF3nN1iR7OqnjS4kEnb ehroBIPHNQVhi31rVH5xK9YJ77JCQEV5YM3aQ6Y7ab3uEf3PCZt4TzvSt5ostKaIjSVIgi pSMxpMUuVdn1pys8SqK+zQxR2cA9ME5nIE0hPnjYP4YLfUB1jDbu2xrViH0buzK8DaIQmR FHtxLGW53mctfBBNceVIhRjCif+wbfFmRHkShrgjgHuMyOWydofTZ+XckkfnI+Luzd/yzY CRBuVf9vMxYPyhdBhIprDZ/VvyX/ZnQ2dQc052K3Pdd3TiiKs4kacMMStWW6dQ== Date: Wed, 09 Aug 2023 22:34:39 -0400 From: Juliana Sims Subject: oops, emailed this wrong To: 65189-done@debbugs.gnu.org Message-Id: X-Mailer: geary/43.0 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed X-GND-Sasl: juli@incana.org X-Spam-Score: -1.7 (-) X-Debbugs-Envelope-To: 65189-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.7 (--) i done did a bad and sent the email wrong :( From unknown Fri Jun 20 20:02:32 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 07 Sep 2023 11:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator