From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp10.migadu.com ([2001:41d0:2:4a6f::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms0.migadu.com with LMTPS
	id CJrJGyoCQmKVBQAAgWs5BA
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Mon, 28 Mar 2022 20:44:58 +0200
Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp10.migadu.com with LMTPS
	id OLsHFCoCQmI7KQAAG6o9tA
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Mon, 28 Mar 2022 20:44:58 +0200
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 E100E29DAC
	for <larch@yhetil.org>; Mon, 28 Mar 2022 20:44:56 +0200 (CEST)
Received: from localhost ([::1]:53828 helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	id 1nYuMK-0000vb-5b
	for larch@yhetil.org; Mon, 28 Mar 2022 14:44:56 -0400
Received: from eggs.gnu.org ([209.51.188.92]:45094)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1nYuLS-0000uC-Ak
 for guix-patches@gnu.org; Mon, 28 Mar 2022 14:44:02 -0400
Received: from debbugs.gnu.org ([209.51.188.43]:37067)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1nYuLR-0006Qt-Kj
 for guix-patches@gnu.org; Mon, 28 Mar 2022 14:44:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1nYuLR-0001WE-J0
 for guix-patches@gnu.org; Mon, 28 Mar 2022 14:44:01 -0400
X-Loop: help-debbugs@gnu.org
Subject: [bug#54615] [PATCH 1/2] gnu: spike: Substitute path to dtc instead of
 wrapping executables.
References: <20220328184117.25158-1-arunisaac@systemreboot.net>
In-Reply-To: <20220328184117.25158-1-arunisaac@systemreboot.net>
Resent-From: Arun Isaac <arunisaac@systemreboot.net>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: guix-patches@gnu.org
Resent-Date: Mon, 28 Mar 2022 18:44:01 +0000
Resent-Message-ID: <handler.54615.B54615.16484930065782@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 54615
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 54615@debbugs.gnu.org
Cc: Arun Isaac <arunisaac@systemreboot.net>,
 Efraim Flashner <efraim@flashner.co.il>
Received: via spool by 54615-submit@debbugs.gnu.org id=B54615.16484930065782
 (code B ref 54615); Mon, 28 Mar 2022 18:44:01 +0000
Received: (at 54615) by debbugs.gnu.org; 28 Mar 2022 18:43:26 +0000
Received: from localhost ([127.0.0.1]:59195 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1nYuKr-0001VA-VY
 for submit@debbugs.gnu.org; Mon, 28 Mar 2022 14:43:26 -0400
Received: from mugam.systemreboot.net ([139.59.75.54]:51780)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <arunisaac@systemreboot.net>) id 1nYuKq-0001Uv-8K
 for 54615@debbugs.gnu.org; Mon, 28 Mar 2022 14:43:25 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type:
 MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID:
 Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc
 :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:
 List-Subscribe:List-Post:List-Owner:List-Archive;
 bh=Hikk2s2WOCJriNhOiBAW9g6iWECrb84FDWks6/SENCc=; b=C+nRRd+grwwdb2iRyztzErbEgs
 FieT0IoeKqOv7HUOGdaM/+S6EOWkDyP/iOKGhPP1VrWv9IzOcuUl4hF5Umw08iv1nYYK+/pc+a0l9
 Lf7EuHAlkEgagSjTPx+X/XTbALVAIj76r15mlDAIzAdovbduWI7Osm1OIIbeKxb0ynEwYwOLXZH1c
 tzQVKUW4kULSRVrk5HBxSwCYKDEEbCKDGQdJbyOYI3DYPiVkZmLx5HYAwK48QgyIZGDJFo1sCAu8i
 8CXJmpT9/SwlknhKKwqlicwCYlcGoWbq71IEmTMlo4iCLI+CVkcDD3ElI4bBsg4kV6TZPb0oPJB38
 GvVi9KIg==;
Received: from [192.168.2.1] (port=7222 helo=localhost.localdomain)
 by systemreboot.net with esmtpsa (TLS1.3) tls
 TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95)
 (envelope-from <arunisaac@systemreboot.net>) id 1nYuKn-000OKi-3A;
 Tue, 29 Mar 2022 00:13:21 +0530
From: Arun Isaac <arunisaac@systemreboot.net>
Date: Tue, 29 Mar 2022 00:13:18 +0530
Message-Id: <20220328184319.25281-1-arunisaac@systemreboot.net>
X-Mailer: git-send-email 2.34.0
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: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+larch=yhetil.org@gnu.org>
X-Migadu-Flow: FLOW_IN
X-Migadu-To: larch@yhetil.org
X-Migadu-Country: US
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1648493098;
	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=Hikk2s2WOCJriNhOiBAW9g6iWECrb84FDWks6/SENCc=;
	b=C35hsrLlO7hkWZ9t8JvY38O0LGyZV86Qu0SCl2qJ1K2aN5+tpiZHR0u98NALeBsN/rEbkM
	AlysHfGsVnSkmNCF0nAULZH+uv9vUS0VTwQ6skWzLi/kzRlm5lV9pBgKVYVgOnC/3CPD1u
	jCkMDns40Q032mQ3BNyPX8+mngo8AzT8tmeGUz8M1C1oA9+ImuC6V7LCxAc1SIaz0tUOl5
	gTPgK7DGOFKloTXHaGsGIfCKY+DGNN4X+POn5IBHPWqqGNWAZztWUj0U+wOdzzqMYD1GHu
	jgmUz0Aea5xYo5JFzk+Vf6IiR89D3wY+ZKJnezEuUzIvxDYHZEFzQsr24kpm2Q==
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1648493098; a=rsa-sha256; cv=none;
	b=gfV1L0Ar9MULGaJwXgJmQ5ctlV9onostZl3wHxtOkGWDNl/sS5Szghf4fBwBle2AmZxJ7S
	oa0QHJ6GkkS2/PQZj2Q2keREfXQJKaLHxa0wxGfcrIYfikounBVnLOoImRC3XuB5Pdnmgn
	dK/TLp0kPevSrAhbkRHkM61jEO7iL8DqgKHV7e/omKKSjDAmySBCJsVVgknqQaSaYO879H
	owUuyV6sEFvBTUCXfALTvQvBzigoxxG3grARdGrqWX3nwh0K9ys5UlXNea5LrptXRWbZnI
	z94ps+CO0nWNhYnVwRsQUIzqrZSYSxZWbUUw1MHpT87sA7oRE3JbHQMcdtz+xQ==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=systemreboot.net header.s=default header.b=C+nRRd+g;
	dmarc=fail reason="SPF not aligned (relaxed)" header.from=systemreboot.net (policy=none);
	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"
X-Migadu-Spam-Score: 6.94
Authentication-Results: aspmx1.migadu.com;
	dkim=fail ("headers rsa verify failed") header.d=systemreboot.net header.s=default header.b=C+nRRd+g;
	dmarc=fail reason="SPF not aligned (relaxed)" header.from=systemreboot.net (policy=none);
	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"
X-Migadu-Queue-Id: E100E29DAC
X-Spam-Score: 6.94
X-Migadu-Scanner: scn1.migadu.com
X-TUID: ZM0fHGttqyiQ

* gnu/packages/virtualization.scm (spike)[arguments]: Delete the wrap-binary
phase. Add a configure-dtc-path phase that substitutes the absolute path to
dtc.
---
 gnu/packages/virtualization.scm | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index bd297977df..9c86670ce7 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -26,6 +26,7 @@
 ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
 ;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2022 Ekaitz Zarraga <ekaitz@elenq.tech>
+;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1037,15 +1038,12 @@ (define-public spike
      (list
        #:phases
        #~(modify-phases %standard-phases
-           (add-after 'install 'wrap-binary
-             (lambda* (#:key inputs outputs #:allow-other-keys)
-               (let ((out (assoc-ref outputs "out")))
-                 (for-each
-                   (lambda (file)
-                     (wrap-program file
-                       `("PATH" ":" prefix
-                         (,(dirname (search-input-file inputs "/bin/dtc"))))))
-                   (find-files (string-append out "/bin")))))))))
+           (add-before 'configure 'configure-dtc-path
+             (lambda* (#:key inputs #:allow-other-keys)
+               ;; Reference dtc by its absolute store path.
+               (substitute* "riscv/dts.cc"
+                 (("DTC")
+                  (string-append "\"" (assoc-ref inputs "dtc") "/bin/dtc\""))))))))
     (inputs
      (list bash-minimal dtc))
     (native-inputs
-- 
2.34.0