From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id Vx5NF6iUT2E8WwAAgWs5BA (envelope-from ) for ; Sat, 25 Sep 2021 23:29:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id YMlVEqiUT2GbCAAA1q6Kng (envelope-from ) for ; Sat, 25 Sep 2021 21:29:12 +0000 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 AB5592968E for ; Sat, 25 Sep 2021 23:29:11 +0200 (CEST) Received: from localhost ([::1]:54644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUFEM-0007To-8b for larch@yhetil.org; Sat, 25 Sep 2021 17:29:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37936) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUFEE-0007TK-KQ for bug-guix@gnu.org; Sat, 25 Sep 2021 17:29:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51632) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mUFEE-00006E-CN for bug-guix@gnu.org; Sat, 25 Sep 2021 17:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mUFEE-000127-6D for bug-guix@gnu.org; Sat, 25 Sep 2021 17:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#33896: [PATCH 1/2] gnu: libblockdev: Embed executable paths. References: <20181228143255.78bf15b1@scratchpost.org> In-Reply-To: <20181228143255.78bf15b1@scratchpost.org> Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 25 Sep 2021 21:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33896 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 33896@debbugs.gnu.org Received: via spool by 33896-submit@debbugs.gnu.org id=B33896.16326052883882 (code B ref 33896); Sat, 25 Sep 2021 21:29:02 +0000 Received: (at 33896) by debbugs.gnu.org; 25 Sep 2021 21:28:08 +0000 Received: from localhost ([127.0.0.1]:34945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUFDM-00010Y-0h for submit@debbugs.gnu.org; Sat, 25 Sep 2021 17:28:08 -0400 Received: from out0.migadu.com ([94.23.1.103]:13227) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUFDI-00010M-QT for 33896@debbugs.gnu.org; Sat, 25 Sep 2021 17:28:06 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1632605283; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wLqte5WARLkez7V6BmdPYlntD8v2YiMVkhXi4ZQLIAI=; b=SDzkf2sBf6y1khGPL8I8jQqkN3LRXcmNotcIe6uxjWrIsl+WwIz/pdLmfsJwYftrGwKsCn ICGIkJ1zv3I+6ElOrOeziPaoMnz3HIIuxthIseSPFGF64P4SQ5ohWkqh67csshIPoh1Pqj 5qMy3sKSzmm4Aj0/9VrpxhzRAdE4mzw= From: Sarah Morgensen Date: Sat, 25 Sep 2021 14:28:01 -0700 Message-Id: <8a50a917c91792e8d5b9f69a31485a3909559ef5.1632604842.git.iskarian@mgsn.dev> 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: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1632605351; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=wLqte5WARLkez7V6BmdPYlntD8v2YiMVkhXi4ZQLIAI=; b=ZnLB6qX1k9tHwe5+j7j4EbwAIISMAL+pW98U9XTaqPVrGiws7wu+XFVstH7MM7BT4UZrAa QILecxhrhqstMPJs5WCcxzIui4iwZxNfD5CBQTNrhc6ZTaS6Jmvirqgo5FlZRaPcRhrS65 wq6P+KNDCcIs500vatpdNA6kMJjTx8TXDq8XXG+Hi1fzOtzq14TjkMhur3fm0xCJNCcyWW DT7J2hmu87JZg5A/OYh443hu5qHlAw20Iz1jzo2w0EevFl9mkPS4DZ3PYhstJIEMn47f+T +DNxxfAt18c3KZAYJIneKfWNY4aoe9zV6i0QYFSqmmLMT8Yk2G5bOFgFkT28wA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632605351; a=rsa-sha256; cv=none; b=PMRaRBE8fIOBTNwYNit3S85RYQrMDj9Y3lx/KnH7UlPHzMrT6lyHHjnd3E3wYn57fKy9JN JN8TQj6/fJ70LnA0URt/4x4BNt7byEh2KKhLNhfEnSLlPq3pPFzc4P6r2egmEkMWQ3TFGO LtN1/ofeB8PESywKgnzfF1ky+9fKMg8WVTXeya6tswHvKA0QS5bfpkX+RpzDbjzGN9tdKy MzJNXL/a1nMu9MwaOpdy0JNALrOuwEDRYCUk+BR+OmkwompnERPCcZnDy+FFMyP6YypEAs 5fC6RCNNveZEFT+XBCVW5qRvfWUGO3CAgZp6K3XuOMFQEdrLU2bsvPfqYTTQhw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=SDzkf2sB; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: -0.29 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=SDzkf2sB; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mgsn.dev (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: AB5592968E X-Spam-Score: -0.29 X-Migadu-Scanner: scn0.migadu.com X-TUID: aKEbBRQyWzBh Fixes . * gnu/packages/disk.scm (libblockdev)[arguments]<#:phases>: Add 'patch-plugin-paths' phase. --- gnu/packages/disk.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 7d6f3811dd..f3a7eb7617 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2021 Michael Rohleder ;;; Copyright © 2021 Mathieu Othacehe ;;; Copyright © 2021 Brice Waegeneire +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -940,7 +941,13 @@ to create devices with respective mappings for the ATARAID sets discovered.") (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 `(("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) base-commit: 69f37702dfcda776a190d5c40fad8518469ce3c4 -- 2.33.0