From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id sCazLylCBGfsEgAAe85BDQ:P1 (envelope-from ) for ; Mon, 07 Oct 2024 20:18:49 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id sCazLylCBGfsEgAAe85BDQ (envelope-from ) for ; Mon, 07 Oct 2024 22:18:49 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=uOu4B43F; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=XR80VAQP; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1728332329; a=rsa-sha256; cv=none; b=LdTUyZNz3mq9xFwk7PrNIWIQfAIsB5dFuHcZTuBQ8WGO7nLU4aHB+LT0NrnMCqfEf2NBBD ro1peGqg6mQ8Tk4ZRIldQzqsJj3QwKYRXmklA3QSCaPnrLySUtPROHU05h2zNUnMJiqsjJ HVTZH+wx910PcSpjHTZnj613akIVGngur9/dj+fEhn9ZEGbJBfTrpqW0OipKvff149uAHb RQI8iKA+T1yrsyQV8lTIle81oqD/WGsdR5/KrWVl385BNthPyKRr0F8uk6rWWcIyF06NTC tAS++kjXuv3n9xW2cGaR9tZfsOJSRlQeUV9CZH/dznwFYKXVG5p90QZt9XCLpw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=uOu4B43F; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=XR80VAQP; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1728332329; h=from:from:sender:sender:reply-to: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=avW/Wa9y0v6xUdBCgVlkJOETSKKTx7LqMYiBf2tr5p0=; b=lUI88Kjq38VuLeebzDeuC2LoS0rldmxxUuEsvl/Lo/RJkOmZlj3zkYSjmY2VMaqA+wY8Fh z9wavhkW7tYwugelKwnSWpwbvdgovEt5rfr8lNLzx37nlHA8wOpmz98mkqxp8zi3yMgYL0 tzyso/cXfFJeuen8CkW32RQQ8T6bfpxwoOfd0yWqlNgvuqtUdExRafDISWy5ohlJH7KnIG VhWhRcqEw9KaAry6DMbNQ9zGHGYK4/0usD1A0J4qHJpYtDDgZIon089Pro0XSmhiFHpLei cqVth3/62hpnxMOgICVcbqfYlu3UQhIjQGMwyLh2yTzoo+582UrbaXsORXGcYA== 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 7E9021978F for ; Mon, 07 Oct 2024 22:18:49 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxuBN-0001Fp-Fx; Mon, 07 Oct 2024 16:18:17 -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 1sxuB3-0000u5-5p for guix-patches@gnu.org; Mon, 07 Oct 2024 16:17:57 -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 1sxuB2-0002WG-T9 for guix-patches@gnu.org; Mon, 07 Oct 2024 16:17:56 -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=avW/Wa9y0v6xUdBCgVlkJOETSKKTx7LqMYiBf2tr5p0=; b=uOu4B43FrPlVeRdaG+1YwJ2Ctzpjy2NLtSH9CqAiV430aJHHBW7mp5QLFJJNbwhf0XHmk/EHe1OLHkJ+ACcJhriPQdCugLhmvJCVH95udgHq0OQhzZO+zLItUnlOYY/7AMrzN2Hlg15kQyLig6j9IQPqdp6m32ZDComooY1hcgv8xJiwwoK2NjjZKFP7YcXEehocxNFI3Y8e6MlN+YDwSTm9IadqPZCjHGwlV/nhao+6kv9gZDrPzmnsL/l4uHk6KvrDaoh71cj505AbWA2gFmyiwORj238PiXIBeRi5ulX4eyMEqUnPJ+IEWeO0yiwWnbH3vF7U05ABo7Vu6bhv+w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxuBA-0001k5-GI for guix-patches@gnu.org; Mon, 07 Oct 2024 16:18:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71327] [PATCH v2 5/7] gnu: libblockdev: Use gexps. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Oct 2024 20:18:04 +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.17283322536601 (code B ref 71327); Mon, 07 Oct 2024 20:18:04 +0000 Received: (at 71327) by debbugs.gnu.org; 7 Oct 2024 20:17:33 +0000 Received: from localhost ([127.0.0.1]:48386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxuAf-0001iN-4A for submit@debbugs.gnu.org; Mon, 07 Oct 2024 16:17:33 -0400 Received: from 3.mo550.mail-out.ovh.net ([46.105.60.232]:54345) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxuAb-0001hz-Ql for 71327@debbugs.gnu.org; Mon, 07 Oct 2024 16:17:31 -0400 Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.25.152]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4XMr6S5zS0z1WkT for <71327@debbugs.gnu.org>; Mon, 7 Oct 2024 20:17:20 +0000 (UTC) Received: from ghost-submission-55b549bf7b-crf8t (unknown [10.108.54.32]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id C89BE1FD1D; Mon, 7 Oct 2024 20:17:19 +0000 (UTC) Received: from ngraves.fr ([37.59.142.100]) by ghost-submission-55b549bf7b-crf8t with ESMTPSA id 3HGDGM9BBGdVdQUAx9YrFw (envelope-from ); Mon, 07 Oct 2024 20:17:19 +0000 X-OVh-ClientIp: 86.246.19.221 Date: Mon, 7 Oct 2024 22:12:31 +0200 Message-ID: <20241007201652.15133-6-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 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 4742290408007328465 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvddvledgudeglecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddruddttdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedufedvjeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtddpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=avW/Wa9y0v6xUdBCgVlkJOETSKKTx7LqMYiBf2tr5p0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1728332240; v=1; b=XR80VAQP3VKqlAJ5tzN7B3FxrYDlaELTQQogGcY8GLPf4LogYLi34VGMlq1qfXQ9Ku86H4Zn WJxUaRrNGYTZQtzgyD6vgUQRK9JYym7aukZif2INYHOPKYXQueJ1MHO+DqNnSXnWeB8oZ344Fwg MxoP213X6Gbku+NVijjzUHfMYQSGZOqVaq4jxWeOLB/bnsfO7dE4OpiR1JFrmSI7uTKP0FDyxTf Mzle1P+/iTQQhxdxyBxow5r41CgdY805KXlCp79gxCw3EisN3+Qt7w6d4TdZcnmWy3yyf1IzUFI kwiY9U0PvO/zcufF5TDwJHBDd4A8RNniSriz69ofdBw+w== 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 From: Nicolas Graves via Guix-patches via 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: 0.95 X-Spam-Score: 0.95 X-Migadu-Queue-Id: 7E9021978F X-Migadu-Scanner: mx12.migadu.com X-TUID: jEjlV1tur98O From: Maxim Cournoyer * gnu/packages/disk.scm (libblockdev) [phases]: Use gexps. {patch-plugin-paths}: Use search-input-file. Change-Id: I61f9b3dfdd4dc249fb0f59abb99826a8e759bb42 --- gnu/packages/disk.scm | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 1278eb2aca..e9b21763e1 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1191,19 +1191,26 @@ (define-public libblockdev "1ny2glwmb5dcdv2x0giinbyma9fhk59z8117k1kr15pm7yjk7jx5")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-configuration-directory - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-configuration-directory + (lambda _ (substitute* "src/lib/blockdev.c" - (("/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))))))))) + (("/etc/libblockdev/conf.d/" path) + (string-append #$output path))))) + (add-after 'unpack 'patch-plugin-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "src/plugins" "\\.c$") + (("(gchar \\*arg.+\\{\")([^\"]+)" all start program) + (string-append + start (or (false-if-exception + (search-input-file inputs + (string-append "bin/" program))) + (false-if-exception + (search-input-file inputs + (string-append "sbin/" program))) + program))))))))) (native-inputs (list gobject-introspection pkg-config -- 2.46.0