From: Jacob Hrbek <kreyren@rixotstudio.cz>
To: 57809@debbugs.gnu.org
Cc: Jacob Hrbek <kreyren@rixotstudio.cz>
Subject: [bug#57809] [PATCH] gnome-boxes: Fix path for 'qemu-img'
Date: Mon, 19 Sep 2022 21:36:15 +0000 [thread overview]
Message-ID: <20220919213607.24888-1-kreyren@rixotstudio.cz> (raw)
In-Reply-To: <20220914181624.13204-1-kreyren@rixotstudio.cz>
[-- Attachment #1.1: Type: text/plain, Size: 5144 bytes --]
---
gnu/packages/gnome.scm | 102 ++++++++++++++++++++++-------------------
1 file changed, 55 insertions(+), 47 deletions(-)
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
+ ;; For all others.
+ license:lgpl2.0+))))
(define-public geary
(package
--
2.37.3
[-- Attachment #1.2: publickey - kreyren@rixotstudio.cz - 1677db82.asc --]
[-- Type: application/pgp-keys, Size: 713 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 249 bytes --]
next prev parent reply other threads:[~2022-09-19 21:37 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-14 18:17 [bug#57809] [PATCH] gnome-boxes: Add 'qemu' as propagated-input Jacob Hrbek
2022-09-14 18:18 ` [bug#57810] " Jacob Hrbek
2022-09-15 13:03 ` [bug#57809] " Maxime Devos
2022-09-18 20:43 ` [bug#57809] [PATCH] gnome-boxes: Patch 'qemu-img' path Jacob Hrbek
2022-09-18 21:05 ` Jacob Hrbek
2022-09-18 21:14 ` Maxime Devos
2022-09-18 21:32 ` Jacob Hrbek
2022-09-18 21:50 ` Maxime Devos
2022-09-19 4:28 ` Jacob Hrbek
2022-09-19 13:35 ` Maxime Devos
2022-09-18 20:46 ` Jacob Hrbek
2022-09-18 20:47 ` [bug#57809] [PATCH] gnome-boxes: Add 'qemu' as propagated-input Jacob Hrbek
2022-09-19 4:09 ` [bug#57809] [PATCH] gnome-boxes: Patch 'qemu-img' path Jacob Hrbek
2022-09-19 13:41 ` Maxime Devos
2022-09-26 21:03 ` bug#57809: [PATCH] gnome-boxes: Add 'qemu' as propagated-input Ludovic Courtès
2022-09-19 21:36 ` Jacob Hrbek [this message]
2022-09-20 5:18 ` [bug#57809] [PATCH] gnome-boxes: Fix path for 'qemu-img' Liliana Marie Prikler
2022-09-20 7:55 ` Jacob Hrbek
2022-09-20 17:12 ` Liliana Marie Prikler
2022-09-26 21:07 ` [bug#57809] [PATCH] gnome-boxes: Add 'qemu' as propagated-input Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220919213607.24888-1-kreyren@rixotstudio.cz \
--to=kreyren@rixotstudio.cz \
--cc=57809@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).