From patchwork Fri Jan 26 04:58:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 59414 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 7843927BBEA; Fri, 26 Jan 2024 04:59:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 5980F27BBE2 for ; Fri, 26 Jan 2024 04:59:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTEIr-000575-Vk; Thu, 25 Jan 2024 23:58:58 -0500 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 1rTEIr-00056f-1X for guix-patches@gnu.org; Thu, 25 Jan 2024 23:58:57 -0500 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 1rTEIq-0007mh-Nj for guix-patches@gnu.org; Thu, 25 Jan 2024 23:58:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rTEIw-0000R7-TQ; Thu, 25 Jan 2024 23:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68728] [PATCH 2/2] gnu: virt-manager: Fix qemu path substitution. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Fri, 26 Jan 2024 04:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68728 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68728@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 68728-submit@debbugs.gnu.org id=B68728.17062451401657 (code B ref 68728); Fri, 26 Jan 2024 04:59:02 +0000 Received: (at 68728) by debbugs.gnu.org; 26 Jan 2024 04:59:00 +0000 Received: from localhost ([127.0.0.1]:49876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTEIt-0000Qe-FL for submit@debbugs.gnu.org; Thu, 25 Jan 2024 23:58:59 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:50030) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTEIo-0000QK-Dd for 68728@debbugs.gnu.org; Thu, 25 Jan 2024 23:58:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1706245090; h=from:from: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: in-reply-to:in-reply-to:references:references; bh=PhSD029P0uOW6LtKHiT25RXtKMWdvSb/98PH9hVyfnA=; b=GpjG+7rGIx3ysU4NhXEMer8ROS3fRlVxC+P76chinaic8iz6croTPpHkmGvRl3Mw9ZX9ef V4NzM/xHe0D7Alwpz44u1nlLJzf6ceB7wV6DOew2Xfg86CRSnqE8jp4ib+3P3b2X5goyjn YUbbyrktcpUUc26cKSBjXrhsM7FRfCKN4SICVLAWxhQ4zUI4a5KrrRVdJpME+L41TYHgit rjyH2dm6pGZBNRK5bpWdftP2mvFhqsfD0doP2fCQxQaFRyMFvrzCK158CLOwQOr87xz8Bw sg4bDv/vUITVLPpZCNXWOPuaMvklflweq8u+l/gG+hyUDB0P1pKGfaGxV1tKlA== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Fri, 26 Jan 2024 12:58:20 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: --- 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: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/virtualization.scm (virt-manager)[arguments]<#:phases>: Adjust ‘fix-default-uri’ according to source change. Change-Id: Ic5085841db4759096b844d6f92f81d90554709d1 --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 1c971471c7..5888d777ea 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1645,8 +1645,8 @@ (define-public virt-manager (lambda* (#:key inputs #:allow-other-keys) ;; Xen is not available for now - so only patch qemu. (substitute* "virtManager/createconn.py" - (("/usr(/bin/qemu-system-[a-zA-Z0-9_-]+)" _ suffix) - (search-input-file inputs suffix))))) + (("/usr(/bin/qemu-system-\\*)" _ suffix) + (string-append #$(this-package-input "qemu") suffix))))) (add-before 'wrap 'wrap-with-GI_TYPELIB_PATH (lambda* (#:key inputs #:allow-other-keys) (let* ((bin (string-append #$output "/bin"))