From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:1008:1e59::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id 8E2hFvmyXWbKIwEAA41jLg (envelope-from ) for ; Mon, 03 Jun 2024 14:11:37 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id gIJfEfmyXWZqKwAA62LTzQ (envelope-from ) for ; Mon, 03 Jun 2024 14:11:37 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=jyEve2B2; 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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1717416697; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=OiVO40CWN7g/JHJwPi+s+mAoek41J9GA+9vWULn7/+U=; b=G8yjDef6obH99D1VQU/MMiA1Ps5nCv5TBP0VMKjaZTsQv+5GvAsiIhyr35V++9cNTEaSCH L9CGns9RxOCm6UNoAmaHDnRVg+bPyltJHnjYWGN1NJcow8Hr0lA5JG6LiJVxFtYD198XB7 nTFPhErcpQbOA01FcJZ+qbmnb+pq1IDU2HHgtHTh1qSMbS2iUE40kT3PX9QX7KAJGCMwob 8h+iylljdZ4EnUuIvK+9IMXqxxoMYBXmkSKSEDTc3ZzoPJ5SQ17h+5YadtlZLDx8aSSUjJ wzzHmAsFIahf/knP2jsaRURcAPKnGZTZc9V5mc79527o/k5Ly4mIep7RfBST0g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=jyEve2B2; 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=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1717416697; a=rsa-sha256; cv=none; b=rzWuoMyhqUxcCKeZkpeNZ1LqMoqMYvPllRaQ1Z/7TMdGYl8xN43OyW1kbZo1Yi35rIedCT FGykcRYqY+kQvXO9PcrOENC5vjaAQedctOxHiiK3srk8hxvzuGXV3ykAW//cIqE3154tsu ZO456W6sh1NJVJo9CR6/uMpcmFlIIvQB4KUYO4SsUB74SV5Qq6M6fxVFlJT8NqEnsnReFx 2UTjgbCU+PF5LIJpQ6c8KHvXmf6ZHDD2P0EEEpeQuZrTc9c6/mBipmXi70HmYGJZW+9C3T 3ed3WXu3Ol6JMXGEx6rn2QfHsfw+CFIcItamhRMGoBm2/WfyUPyep4CS8pWTbQ== 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 247062376D for ; Mon, 3 Jun 2024 14:11:37 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sE6Wb-0002wT-Ro; Mon, 03 Jun 2024 08:10:55 -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 1sE6WZ-0002qo-BD for guix-patches@gnu.org; Mon, 03 Jun 2024 08:10:51 -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 1sE6WY-0001ep-SV for guix-patches@gnu.org; Mon, 03 Jun 2024 08:10:50 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sE6Wk-0002rz-OP; Mon, 03 Jun 2024 08:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71327] [PATCH 2/8] gnu: libblockdev: Embed executable paths. 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:11: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: Sarah Morgensen , Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 71327-submit@debbugs.gnu.org id=B71327.171741662310902 (code B ref 71327); Mon, 03 Jun 2024 12:11:02 +0000 Received: (at 71327) by debbugs.gnu.org; 3 Jun 2024 12:10:23 +0000 Received: from localhost ([127.0.0.1]:34574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE6W6-0002pf-Le for submit@debbugs.gnu.org; Mon, 03 Jun 2024 08:10:23 -0400 Received: from mail-qt1-f181.google.com ([209.85.160.181]:53388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE6R9-0002b3-2l for 71327@debbugs.gnu.org; Mon, 03 Jun 2024 08:05:16 -0400 Received: by mail-qt1-f181.google.com with SMTP id d75a77b69052e-43fab2fa4ccso24538291cf.2 for <71327@debbugs.gnu.org>; Mon, 03 Jun 2024 05:05:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717416235; x=1718021035; 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=OiVO40CWN7g/JHJwPi+s+mAoek41J9GA+9vWULn7/+U=; b=jyEve2B26hy5o9oZxHIY11eBTTLSaVjmgeI0GAfMBDiguG6GvtHI/T7oiWz64akL/8 hQjeweYMeLYqKznCwpSqM/SL5iP2UPLLAlEqilOru5/0lm/YPJraU8KNcRVXZoTDXNXP lXwIZrMrQMsTUVHXDrOEmHn6jjhsB1HWysamHEeAlaOMhvTd0ziBEpYmVztO+m53HxUx 9EuOg4GnydUako6aBzunTJ/GbDBuHHvCXKXLI7lt1kQoE7fLn0/NH1qaqATcOhCZQLIe ZqNvEdblxRGfNNFXYOEkOt8K+hiZuB/MihsfsZSWDOYsytBRJXx54yr2eVd45DHdD1EN DcHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717416235; x=1718021035; 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=OiVO40CWN7g/JHJwPi+s+mAoek41J9GA+9vWULn7/+U=; b=ukEc2WO2P4+hm4s259PNUDmK45UCoahYf0S4QIU4Vx+cleCuyRVST25TpvlFa6GVoW q6Y8xssEONRHz4VUoczB0/ll69YeNr4OggezY/AjURSK40j9pTwTYo+NxJnL0lVaqDHP RUf98iARDAodUcD65f0mU++aR1dJkpQGgQK3iTf60V/6uAO+ttSxV5S4GSNUybs5qBI+ 9Mbf4CC8OPO4mjSL/K9LcAN3MtuAVYCnMmq/9orhQtBwQ1ps7P+gH4x0uGilchvfen9d l3N/5rsAQoE6mpzxM2VEg0LVOAWYx8YH5Blz7SiG2Zt2vhdBgODBsJN80zxhzmzhDlN1 C73A== X-Gm-Message-State: AOJu0Yy9WF5YQqtOofOu9PhGJKjQjiYGTaQdu21yek4ycT74YFzsiaf5 Oc4YFTYxe7U1hw1tE7Wc4pu57fmoRDrtJJih0THOrWLS6egwceCilrGfeg== X-Google-Smtp-Source: AGHT+IF4B7Thgf/NQXgjVTYW9uieMkjxxahV6vAFGwc8jbX0H9k5+sOvzrDWyurFh/UXywAE5hdEgA== X-Received: by 2002:a05:622a:1a24:b0:43a:8353:775c with SMTP id d75a77b69052e-43ff5259d75mr93906571cf.2.1717416235240; Mon, 03 Jun 2024 05:03:55 -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.03.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 05:03:54 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 3 Jun 2024 08:02:50 -0400 Message-ID: <0c4bd8c7db24d0734320d4fdb2a2ce1f86a801d2.1717382583.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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit 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-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: 4.16 X-Migadu-Queue-Id: 247062376D X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: 4.16 X-TUID: dJF1xBi2w4K+ 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 10d546b918..10073864ed 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. ;;; @@ -1196,7 +1198,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 -- 2.45.1