From patchwork Sun Sep 18 20:43:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Hrbek X-Patchwork-Id: 42717 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 D8FBA27BBEA; Sun, 18 Sep 2022 21:45:41 +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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 61C7D27BBE9 for ; Sun, 18 Sep 2022 21:45:41 +0100 (BST) Received: from localhost ([::1]:56430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oa1Aa-0000iA-Fj for patchwork@mira.cbaines.net; Sun, 18 Sep 2022 16:45:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50712) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oa1A0-0000fK-EF for guix-patches@gnu.org; Sun, 18 Sep 2022 16:45:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52309) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oa19y-0007Pe-Kr for guix-patches@gnu.org; Sun, 18 Sep 2022 16:45:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oa19y-0003Vx-5E for guix-patches@gnu.org; Sun, 18 Sep 2022 16:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57809] [PATCH] gnome-boxes: Patch 'qemu-img' path References: <20220914181624.13204-1-kreyren@rixotstudio.cz> In-Reply-To: <20220914181624.13204-1-kreyren@rixotstudio.cz> Resent-From: Jacob Hrbek Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Sep 2022 20:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57809 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57809@debbugs.gnu.org Cc: Jacob Hrbek Received: via spool by 57809-submit@debbugs.gnu.org id=B57809.166353384813433 (code B ref 57809); Sun, 18 Sep 2022 20:45:02 +0000 Received: (at 57809) by debbugs.gnu.org; 18 Sep 2022 20:44:08 +0000 Received: from localhost ([127.0.0.1]:51387 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oa196-0003Ub-5Y for submit@debbugs.gnu.org; Sun, 18 Sep 2022 16:44:08 -0400 Received: from mail-4018.proton.ch ([185.70.40.18]:39551) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oa18z-0003Tu-Jg for 57809@debbugs.gnu.org; Sun, 18 Sep 2022 16:44:07 -0400 Date: Sun, 18 Sep 2022 20:43:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rixotstudio.cz; s=protonmail; t=1663533834; x=1663793034; bh=c9V1TQMmWRwL2+kgizZiXUd4gDyUkn03dRmq1PBxdFM=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=TVlwouNxV3dOskNmC0NDHM7DoBz0smtgU1UsR6+sDf2Nqwt5SBOhyILKzGBDBLe2a /PIa92qp538bCy8cJWtgDa6wdwNPsocFqJ6NdzgH4wvnZw0GHzj3HIJiQ13RhnyQuU YdDzIxeqxaCq6L8qGCgYb74XXgtXChCvm6epalIkuK78+DtnlCeVKkMfxIQwaevFsT vUubMWenSwP6RSdcw2JIbmAMUQEMRHGq3XieLTH0BKW5zpB/Isf3w4kL4T6L53gN8/ 3CwGutmzPkw4ay2UQXRjsHz/WJ8BWVxyZScr7T2Bt9BykswfuNX33kBSJ8yk0yN82K +Nhgo3Eaj+Kjw== From: Jacob Hrbek Message-ID: <20220918204335.1734-1-kreyren@rixotstudio.cz> Feedback-ID: 30491181:user:proton 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" X-getmail-retrieved-from-mailbox: Patches --- gnu/packages/gnome.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) gettext-minimal @@ -12141,6 +12147,7 @@ (define-public gnome-boxes itstool pkg-config python + qemu-minimal ;for qemu-img vala)) (inputs (list glib-networking ;for TLS support --- 2.37.1 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d6d22f8eb1..89f5999920 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12111,6 +12111,7 @@ (define-public polari (home-page "https://wiki.gnome.org/Apps/Polari") (license license:gpl2+))) +;; NOTE(Krey): src/util-app.vala might need patched paths (define-public gnome-boxes (package (name "gnome-boxes") @@ -12133,7 +12134,12 @@ (define-public gnome-boxes #:phases #~(modify-phases %standard-phases (add-after 'unpack 'disable-gtk-update-icon-cache (lambda _ - (setenv "DESTDIR" "/")))))) + (setenv "DESTDIR" "/"))) + (add-before 'configure 'substitute-qemu-dependencies + (lambda _ + (substitute* "src/installed-media.vala" + (("qemu-img") + (search-input-file %build-inputs "/bin/qemu-img")))))))) (native-inputs (list desktop-file-utils ;for update-desktop-database