From patchwork Mon Oct 7 20:12:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 68765 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 A338627BBEA; Mon, 7 Oct 2024 21:18:45 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 24FF227BBE2 for ; Mon, 7 Oct 2024 21:18:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxuBL-00015a-95; Mon, 07 Oct 2024 16:18:15 -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 1sxuB1-0000sX-L9 for guix-patches@gnu.org; Mon, 07 Oct 2024 16:17:55 -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 1sxuB1-0002Vw-CK for guix-patches@gnu.org; Mon, 07 Oct 2024 16:17:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=H1rZmWRd5J4XIY8AJdZrFIxbBHA1MgQelc9AaJOA2X4=; b=rkJYC+EblLWA9FVSyYrkT3LHLHftw2vktBZssNd/VhlZ6SRbfkFXnUqM04glDpzesJyQeTelUazGRyzMn7YdFYs4ZYWCMarPagA21VAw3FcofBubkdzwkc1n4Q8Bzz+C95Zcf20+pQdtbPg2n3EBUbICM+GtV6ClVXjR+adEmaJ7PbpkE7mk25ije0re/6KF8OIi/NoEXLVwULNazT2ZOwWr3D7i3oxpZFWhZWAJf2YOS5cIfcnyrrOdOQvyWucY3T0g9jLPuYJYRtivTdvbTEXpBdhfnYVp/LW9bYFOL48sejCZFyNa01kgFEGrLpYwPaDek56bmb1JVs8zD6FzMg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxuB8-0001jj-VF for guix-patches@gnu.org; Mon, 07 Oct 2024 16:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71327] [PATCH v2 2/7] gnu: libblockdev: Embed executable paths. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Oct 2024 20:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71327@debbugs.gnu.org Cc: iskarian@mgsn.dev, maxim.cournoyer@gmail.com Received: via spool by 71327-submit@debbugs.gnu.org id=B71327.17283322466549 (code B ref 71327); Mon, 07 Oct 2024 20:18:02 +0000 Received: (at 71327) by debbugs.gnu.org; 7 Oct 2024 20:17:26 +0000 Received: from localhost ([127.0.0.1]:48372 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxuAX-0001hX-P2 for submit@debbugs.gnu.org; Mon, 07 Oct 2024 16:17:26 -0400 Received: from 9.mo576.mail-out.ovh.net ([46.105.56.78]:33585) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxuAV-0001hN-IN for 71327@debbugs.gnu.org; Mon, 07 Oct 2024 16:17:24 -0400 Received: from director2.ghost.mail-out.ovh.net (unknown [10.108.2.78]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4XMr6L35q4z1w87 for <71327@debbugs.gnu.org>; Mon, 7 Oct 2024 20:17:14 +0000 (UTC) Received: from ghost-submission-55b549bf7b-ddblc (unknown [10.111.182.244]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 7C84D1FD3A; Mon, 7 Oct 2024 20:17:13 +0000 (UTC) Received: from ngraves.fr ([37.59.142.97]) by ghost-submission-55b549bf7b-ddblc with ESMTPSA id +BAWBslBBGcVIAoAYVQw9Q (envelope-from ); Mon, 07 Oct 2024 20:17:13 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-97G002f406af6e-d540-4949-aa88-af6b9a32b671, A12302D5D8CF0E033BA678025A323BF4FAD59D46) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 Date: Mon, 7 Oct 2024 22:12:28 +0200 Message-ID: <20241007201652.15133-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241007201652.15133-1-ngraves@ngraves.fr> References: <20241007201652.15133-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 4740601559927612113 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvddvledgudegkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepudegleefkeehudegvdeiffelkeegffeihfekjeduleevueeuhfehveetgfehtdehnecuffhomhgrihhnpehgnhhurdhorhhgnecukfhppeduvdejrddtrddtrddupdekiedrvdegiedrudelrddvvddupdefjedrheelrddugedvrdeljeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedufedvjeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=H1rZmWRd5J4XIY8AJdZrFIxbBHA1MgQelc9AaJOA2X4=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1728332234; v=1; b=acZbBcBCBwY1tqLU6LWCu7exAGHLHj2c6emMM2Df2ztSVb1hE5AgY4mfW0fzavbkb2PCZmp/ 6qvjuUQ5HHuXuLuh+2IqAeCNizEhznanup4zB5XL/3+mFzud8ggbe7FS2Q7bfycr1JvEh3fukAH WVcaLwg0NkkDevM07uJ71YEwk+Jwf16zA2AbHokHqxKaKty+IvYQYxw1t0Df95U4NnUCEnVUwxP La823YANCXhPSMCUbBfPk3A8WynqcxIOIZz8xImCbM6IHgxFBTiiCJDlqAqRKXfTaJtSu4A19rS tSQDq6ooqN0gs+TKLq7lOe3Tyf2wgCgQ3QQuwaKIDFEtw== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 From: Sarah Morgensen * gnu/packages/disk.scm (libblockdev)[arguments]<#:phases>: Add 'patch-plugin-paths' phase. Fixes: . Signed-off-by: Maxim Cournoyer Change-Id: I96f9e2f03650b22ffef5a7fe091159450e4c5b67 --- gnu/packages/disk.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 0f3bf10ffa..fa1b87127b 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2021 Mathieu Othacehe ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Justin Veilleux +;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2014, 2022 Ludovic Courtès ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Disseminate Dissent @@ -29,6 +30,7 @@ ;;; Copyright © 2023 Morgan Smith ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Sharlatan Hellseher + ;;; ;;; This file is part of GNU Guix. ;;; @@ -1195,7 +1197,13 @@ (define-public libblockdev (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (substitute* "src/lib/blockdev.c" - (("/etc/libblockdev/conf.d/" path) (string-append out path))))))))) + (("/etc/libblockdev/conf.d/" path) (string-append out path)))))) + (add-after 'unpack 'patch-plugin-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "src/plugins" "\\.c$") + (("(gchar \\*arg.+\\{\")([^\"]+)" all start program) + ;; XXX: Use 'search-input-file' when available. + (string-append start (or (which program) program))))))))) (native-inputs (list gobject-introspection pkg-config