From patchwork Mon Sep 19 21:36:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Hrbek X-Patchwork-Id: 42753 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 7E08127BBEA; Mon, 19 Sep 2022 22:37:10 +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 D360227BBE9 for ; Mon, 19 Sep 2022 22:37:09 +0100 (BST) Received: from localhost ([::1]:36484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaORx-0000X5-0h for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 17:37:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaORq-0000Wq-DF for guix-patches@gnu.org; Mon, 19 Sep 2022 17:37:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56412) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaORq-0002g6-4d for guix-patches@gnu.org; Mon, 19 Sep 2022 17:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaORq-00042K-0A for guix-patches@gnu.org; Mon, 19 Sep 2022 17:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57809] [PATCH] gnome-boxes: Fix path for 'qemu-img' 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: Mon, 19 Sep 2022 21:37:01 +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.166362339715486 (code B ref 57809); Mon, 19 Sep 2022 21:37:01 +0000 Received: (at 57809) by debbugs.gnu.org; 19 Sep 2022 21:36:37 +0000 Received: from localhost ([127.0.0.1]:55490 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaORR-00041h-6Y for submit@debbugs.gnu.org; Mon, 19 Sep 2022 17:36:37 -0400 Received: from mail-4323.proton.ch ([185.70.43.23]:37919) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaORM-00041Q-EJ for 57809@debbugs.gnu.org; Mon, 19 Sep 2022 17:36:35 -0400 Date: Mon, 19 Sep 2022 21:36:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rixotstudio.cz; s=protonmail; t=1663623385; x=1663882585; bh=biNbJSQgp69eQAe2Ja2L5xJlGvOP1GcnjwFmwOC8aZY=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=OCBzWBlyyjtPdmh4i/4N7E5oteJeN9zARdNAbZYYoXqbFO1O2zPDApmezLmitnR87 e5E3mTCEuja2WvU7cOg5bEQt42IbmlZESuroRMyLLNYbcehMi8kFRSi8p4wLH4fZ3w KUbTuNW7teil5uc5U2ajT4rUOMlyjebXsSR7waCz2/TTnuLponiPbrpYuUTFUNptSD SULROCaGFMJatK5ryIjB8aLK/XYKXs6Rg1gjAPh1wshe/QXT+vg8BgoTubndmFh8rh hBvQZkTRmTjxfsvkI0/uzXHlAS+P/AOz4L0X3iGmHfA/pq9qTfEwC49KhjoxZyMD0/ nuQWlGisHvlrw== From: Jacob Hrbek Message-ID: <20220919213607.24888-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 | 102 ++++++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 47 deletions(-) + ;; For all others. + license:lgpl2.0+)))) (define-public geary (package --- 2.37.3 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d6d22f8eb1..65054fc4ac 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12115,67 +12115,75 @@ (define-public gnome-boxes (package (name "gnome-boxes") (version "42.3") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/gnome-boxes/" - (version-major version) "/" - "gnome-boxes-" version ".tar.xz")) - (sha256 - (base32 "1lv0bdh935qj6wkv3ixg2pcv8yrapj79z02gw4fal3rhz3xggvsn")))) + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/gnome-boxes/" + (version-major version) + "/" + "gnome-boxes-" + version + ".tar.xz")) + (sha256 + (base32 + "1lv0bdh935qj6wkv3ixg2pcv8yrapj79z02gw4fal3rhz3xggvsn")))) (build-system meson-build-system) (arguments (list #:glib-or-gtk? #t #:configure-flags #~(list "-Drdp=false" - (string-append "-Dc_link_args=-Wl,-rpath=" - #$output - "/lib/gnome-boxes")) + (string-append + "-Dc_link_args=-Wl,-rpath=" + #$output "/lib/gnome-boxes")) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'disable-gtk-update-icon-cache (lambda _ - ( setenv "DESTDIR" "/")))))) - (native-inputs - (list desktop-file-utils ;for update-desktop-database - gettext-minimal - `(,glib "bin") ;for glib-compile-resources - itstool - pkg-config - python - vala)) - (inputs - (list glib-networking ;for TLS support - gsettings-desktop-schemas - gtk+ - gtk-vnc - gtksourceview - json-glib - libarchive - libgudev - libhandy - libosinfo - libsecret - libsoup-minimal-2 - libusb - libvirt - libvirt-glib - libxml2 - sparql-query - spice-gtk - tracker - vte - webkitgtk-with-libsoup2)) ;for webkit2gtk-4.0 + (setenv "DESTDIR" "/"))) + (add-before 'configure 'substitut e-qemu-dependencies + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/installed-media.vala" + (("qemu-img") + (search-input-file inputs "/bin/qemu-img")))))))) + (native-inputs (list desktop-file-utils ;for update-desktop-database + gettext-minimal + `(,glib "bin") ;for glib-compile-resources + itstool + pkg-config + python + vala)) + (inputs (list glib-networking ;for TLS support + gsettings-desktop-schemas + gtk+ + gtk-vnc + gtksourceview + json-glib + libarchive + libgudev + libhandy + libosinfo + libsecret + libsoup-minimal-2 + libusb + libvirt + libvirt-glib + libxml2 + qemu-minimal ;for qemu-img + sparql-query + spice-gtk + tracker + vte + webkitgtk-with-libsoup2)) ;for webkit2gtk-4.0 (home-page "https://wiki.gnome.org/Apps/Boxes") (synopsis "View, access, and manage remote and virtual systems") - (description "GNOME Boxes is a simple application to view, access, and + (description + "GNOME Boxes is a simple application to view, access, and manage remote and virtual systems. Note that this application requires the @code{libvirt} and @code{virtlog} daemons to run. Use the command @command{info '(guix) Virtualization Services'} to learn how to configure these services on the Guix System.") (license (list - ;; For data/icons/empty-boxes.png. - license:cc-by2.0 - ;; For all others. - license:lgpl2.0+)))) + ;; For data/icons/empty-boxes.png. + license:cc-by2.0