From patchwork Mon Jun 3 12:02:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28192 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 AF4AA27BBE9; Mon, 3 Jun 2024 13:15:25 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable 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 7EAE927BBE2 for ; Mon, 3 Jun 2024 13:15:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sE6aT-0004Kl-QP; Mon, 03 Jun 2024 08:14:53 -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 1sE6aS-0004Jt-44 for guix-patches@gnu.org; Mon, 03 Jun 2024 08:14:52 -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 1sE6aQ-0002Hq-HT for guix-patches@gnu.org; Mon, 03 Jun 2024 08:14:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sE6ac-00035x-Lp; Mon, 03 Jun 2024 08:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71327] [PATCH 5/8] gnu: libblockdev: Use gexps. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 03 Jun 2024 12:15: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: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 71327-submit@debbugs.gnu.org id=B71327.171741687811691 (code B ref 71327); Mon, 03 Jun 2024 12:15:02 +0000 Received: (at 71327) by debbugs.gnu.org; 3 Jun 2024 12:14:38 +0000 Received: from localhost ([127.0.0.1]:34884 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE6aE-00032U-2s for submit@debbugs.gnu.org; Mon, 03 Jun 2024 08:14:38 -0400 Received: from mail-oa1-f49.google.com ([209.85.160.49]:48575) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE6aD-000329-1O for 71327@debbugs.gnu.org; Mon, 03 Jun 2024 08:14:37 -0400 Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-2507fa7f37aso1807933fac.1 for <71327@debbugs.gnu.org>; Mon, 03 Jun 2024 05:14:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717416797; x=1718021597; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YXFkN1BtCypnP9YfR/yPWftbznfPLInhEwEmK/Uid9Y=; b=nIjE8HFkzIj0Yd8XOEKEoAsI2Jsk9eaPL0SjPNZt4hdKT7SGhJdatl6a3B0bnciZ3L ab8DC9heZt728WvSPzmxrP1v8LL4D1V7C/YYhqCg2QpraRyQeffl1gNw8dtbTL58S/mY MKpMMUL9LW7Q/ZCoJCH0DGV6sibocxUELk31CqumPDs69CW30HdTnhVU2AOSFw9+fKU1 vEniX/EN6Lxg59BZOSaZYi3Ou4wlGCpf8P2ycFCF3CY4rLGEIEOJAfDwfH6GBnph46mK LFgVpaWdmhaZ3AA1woiFGpsyWVDv2B4pk2lT5IDq7+MFDIK1t6ybaMR6ExBng/eam8mu SVow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717416797; x=1718021597; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YXFkN1BtCypnP9YfR/yPWftbznfPLInhEwEmK/Uid9Y=; b=F5SrfwEKBP3n8EcIuYtp1t7huS/s/h2XvyOdWXLQ+gBn8lwFuWwv+0srDeihNJd51E FrUyiE3d4ITdJHafBm5DPdyTJyI1dp0Ht34tbek5xlM0nUHb2u5+3iP3+0VhdMJ579yz mWBOP1lEf0z3BEG3a0H8XrV0NeYls4EKwRLnGvVa82zub55gZW9Zp/hYwdoHi2M9FhW8 ch175s1EtuUOzZEdeYPLzdGKjP03x9oJG1l4dHcbjFjBZrV06dNYO+4/gatSDUKg0TKt KHl1MaaTyETFlW2OWiuSk/OwkaPHJUjBY+CCEHkWIRP4j2djq9jRdVDWNMwf2P3nG3PZ druA== X-Gm-Message-State: AOJu0YxYzFxmgt5eiACA5yNJFojujJK3CuKZbdnLnFkQnlB1fexHLwv9 qUESSiRzRGX7Y64c5pkW0Ctrl9Kh3PUIel8bNcBCzbCCkijS1uP2VSAtcw== X-Google-Smtp-Source: AGHT+IFdaQMndHSI/zFWDM2b3qQEq9WePQ2a5UPS77GuoSRK010BXo+wrhXEVSzLdirgwfmA+HPr6A== X-Received: by 2002:a05:622a:13ca:b0:43a:b15d:bf69 with SMTP id d75a77b69052e-43ff54da8e1mr118466951cf.46.1717416243530; Mon, 03 Jun 2024 05:04:03 -0700 (PDT) Received: from localhost.localdomain (dsl-154-1.b2b2c.ca. [66.158.154.1]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-43ff258039fsm38876151cf.79.2024.06.03.05.04.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 05:04:03 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 3 Jun 2024 08:02:53 -0400 Message-ID: <0980caab2c95ff572b945bba1a223d2d9a59d210.1717382584.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <1b493965d8ba0a4dc3c06fa813314c4ffa551b3c.1717382583.git.maxim.cournoyer@gmail.com> References: <1b493965d8ba0a4dc3c06fa813314c4ffa551b3c.1717382583.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 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 * 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 7fbd6a52d7..1cdeb53597 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1192,19 +1192,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