From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 8L8YABRO1GR+XgEASxT56A (envelope-from ) for ; Thu, 10 Aug 2023 04:40:20 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id IL8CABRO1GSnGwAAauVa8A (envelope-from ) for ; Thu, 10 Aug 2023 04:40:20 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7C25848754 for ; Thu, 10 Aug 2023 04:40:19 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=incana.org header.s=gm1 header.b=VjmUY+to; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1691635219; a=rsa-sha256; cv=none; b=aYPFtpOGfyGBkqdW+dAXpuKMqXdiFSNfCa370mxcSkZyVfOmguQo7llax3mqMpCFGpIPa4 QyTzMP0qEdfKlYRjZxJ46MzK6XHJH5+g8usxHQiN9Wi057zooe/dz4g2D6oGMBt9ogGPhM wJTUNV1dy5PjEvmg5i3tlQNGCaU+2RpOqX0aJcVy9xcr5+3W/z0GCRvObMQTocUqwlNCBb R+QnbJy2H2AWm7L1kOMu4JXnhh0J2kzxBB4NBFUZDZXiXeD6+XgEyT39Fwz7WG5qzks8XA sxrbPdWV1tO4LDi73nljNNKmVOE/A6rLIFRG/NwnBMNcbs57dvJNvoeLPo7LdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1691635219; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=DeT6xX7ymiaiRIlpK4m+sEOtq9NBGn7vc7jJGgD58qw=; b=QB7jkDe4HX/Ww5vO9MWIoiOxtTO6dDQpz4GkqOyj5Szsp4bZM+WsyNLlggmbQo7KcevmQg 3i9ZmWFIO02u6qMr6tYuTHMOFvSK/RTpCgthaCb84jx4B5gFHtB0sGcwMAQ8DYgPDeoW44 1gBaVVBpn3e2zjU/YRz1pOgzjVLyfYMlGSDbQmpgi7vCop1n/mEq4Oxe7YQo7/ECVbmG6T /TToYF/IgTp+7ZaQIEv91Mw3hSvwO5LQsFnRL11AVFzqhWx/LNXx6sakxd7VQetrJQQgti BMT3e+QzAP/Md/jX/wLXVeIxGzCvr+7Uws6T4qh+lzvs04kcmMxisK75sx+5sw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=incana.org header.s=gm1 header.b=VjmUY+to; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qTvap-00069p-7f; Wed, 09 Aug 2023 22:40:07 -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 1qTvan-00069Z-Cs for guix-patches@gnu.org; Wed, 09 Aug 2023 22:40:05 -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 1qTvak-0005TF-3M for guix-patches@gnu.org; Wed, 09 Aug 2023 22:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qTvaj-0003LK-Vn for guix-patches@gnu.org; Wed, 09 Aug 2023 22:40:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64305] [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 02:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64305 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64305@debbugs.gnu.org Cc: ludo@gnu.org, Juliana Sims Received: via spool by 64305-submit@debbugs.gnu.org id=B64305.169163520012837 (code B ref 64305); Thu, 10 Aug 2023 02:40:01 +0000 Received: (at 64305) by debbugs.gnu.org; 10 Aug 2023 02:40:00 +0000 Received: from localhost ([127.0.0.1]:40781 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qTvai-0003Ky-CG for submit@debbugs.gnu.org; Wed, 09 Aug 2023 22:40:00 -0400 Received: from relay7-d.mail.gandi.net ([2001:4b98:dc4:8::227]:51443) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qTvag-0003Kh-MA for 64305@debbugs.gnu.org; Wed, 09 Aug 2023 22:39:59 -0400 Received: by mail.gandi.net (Postfix) with ESMTPSA id 4C5DA20002; Thu, 10 Aug 2023 02:39:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1691635191; 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=DeT6xX7ymiaiRIlpK4m+sEOtq9NBGn7vc7jJGgD58qw=; b=VjmUY+to3ZT7NhmPvBXz11KdrSdAWTTAqWCfoTMNrYP3icog8xLkp8yEyE08qY+fYX/LjJ 8OiNSVPwQQ0Vis+7RMwRAyNX5B/03xmrLVD6p8BTysY104TvWyQt+j0ZoEsnh0LWs60bEc d4yTs/FHkkXifQ5kv74sEwldLbdjmjK/rjxqnLo7GkhSnhfMflpiqfbYzYcqhLehl24L5A ZoRKWla0jgQyYcZDq1NcEKRwf1/nz6nDOe8hoIURE0mLDWnJ/eyCDfeoiR/xeDYFaOUsQi LFNd27XUW//CWSlWsQCWOyURR0eSxZMKP5ypS4fGYKUassWhwIyeZbvnxZq5rQ== From: Juliana Sims Date: Wed, 9 Aug 2023 22:37:16 -0400 Message-ID: <1b44a2db770f4f2a956c2235ea9cba3f0d1383a9.1691635036.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 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -3.77 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Queue-Id: 7C25848754 X-Spam-Score: -3.77 X-TUID: AjkM/oEy7lLH Hi there, Oops! I sent that last email wrong! For Ludovic: this is the same as that other email, but I want to make sure everything is threaded and catalogued properly. For everyone else: this patch takes Ludovic's advice and substitutes references to "grep" and "awk" in the uwufetch source code with references to the fully-qualified paths of those binaries. It adds them as regular inputs rather than the propagated inputs the previous version of this patch added them as. 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