* [bug#28853] [PATCH 1/8] gnu: virt-manager: Enable gtk schemas and glib modules support.
2017-10-15 19:15 [bug#28853] Some virt-manager improvements Andy Patterson
@ 2017-10-15 20:03 ` Andy Patterson
2017-10-16 13:25 ` 宋文武
2017-10-15 20:03 ` [bug#28853] [PATCH 2/8] gnu: qemu: Enable spice usb redirection support Andy Patterson
` (6 subsequent siblings)
7 siblings, 1 reply; 21+ messages in thread
From: Andy Patterson @ 2017-10-15 20:03 UTC (permalink / raw)
To: 28853
Fixes a crash when opening the file chooser dialog.
* gnu/packages/virtualization.scm (virt-manager)[arguments]
<#:imported-modules>: Add (guix build glib-or-gtk-build-system).
<#:modules>: Import (guix build glib-or-gtk-build-system) as glib-or-gtk:.
<#:arguments>: Add 'glib-or-gtk-compile-schemas and 'glib-or-gtk-wrap.
---
gnu/packages/virtualization.scm | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 4e384e79a..5cdf6d09b 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -499,9 +499,12 @@ virtualization library.")
;; Some of the tests seem to require network access to install virtual
;; machines.
#:tests? #f
+ #:imported-modules ((guix build glib-or-gtk-build-system)
+ ,@%python-build-system-modules)
#:modules ((ice-9 match)
(srfi srfi-26)
(guix build python-build-system)
+ ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils))
#:phases
(modify-phases %standard-phases
@@ -528,7 +531,11 @@ virtualization library.")
`("GI_TYPELIB_PATH" ":" prefix
,(filter identity paths))))
bin-files))
- #t)))))
+ #t))
+ (add-after 'install 'glib-or-gtk-compile-schemas
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
+ (add-after 'install 'glib-or-gtk-wrap
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(inputs
`(("gtk+" ,gtk+)
("gtk-vnc" ,gtk-vnc)
--
2.14.2
^ permalink raw reply related [flat|nested] 21+ messages in thread* [bug#28853] [PATCH 1/8] gnu: virt-manager: Enable gtk schemas and glib modules support.
2017-10-15 20:03 ` [bug#28853] [PATCH 1/8] gnu: virt-manager: Enable gtk schemas and glib modules support Andy Patterson
@ 2017-10-16 13:25 ` 宋文武
2017-10-19 2:19 ` Andy Patterson
0 siblings, 1 reply; 21+ messages in thread
From: 宋文武 @ 2017-10-16 13:25 UTC (permalink / raw)
To: Andy Patterson; +Cc: 28853
Andy Patterson <ajpatter@uwaterloo.ca> writes:
> virt-manager: Enable gtk schemas and glib modules support.
How about: Wrap with GSettings schema and GIO modules search paths.
Otherwise, this patch series look good to me, thanks!
^ permalink raw reply [flat|nested] 21+ messages in thread
* [bug#28853] [PATCH 1/8] gnu: virt-manager: Enable gtk schemas and glib modules support.
2017-10-16 13:25 ` 宋文武
@ 2017-10-19 2:19 ` Andy Patterson
2017-10-26 5:18 ` Ludovic Courtès
0 siblings, 1 reply; 21+ messages in thread
From: Andy Patterson @ 2017-10-19 2:19 UTC (permalink / raw)
To: 宋文武; +Cc: 28853
Hi,
On Mon, 16 Oct 2017 21:25:18 +0800
iyzsong@member.fsf.org (宋文武) wrote:
> Andy Patterson <ajpatter@uwaterloo.ca> writes:
>
> > virt-manager: Enable gtk schemas and glib modules support.
>
> How about: Wrap with GSettings schema and GIO modules search paths.
>
> Otherwise, this patch series look good to me, thanks!
Sounds good, updated patch appened:
--
Andy
From f504ccc9e961e7657261a478e278c142b9006e6b Mon Sep 17 00:00:00 2001
From: Andy Patterson <ajpatter@uwaterloo.ca>
Date: Sun, 15 Oct 2017 11:47:16 -0400
Subject: [PATCH] gnu: virt-manager: Wrap with GSettings schema and GIO modules
search paths.
Fixes a crash when opening the file chooser dialog.
* gnu/packages/virtualization.scm (virt-manager)[arguments]
<#:imported-modules>: Add (guix build glib-or-gtk-build-system).
<#:modules>: Import (guix build glib-or-gtk-build-system) as glib-or-gtk:.
<#:arguments>: Add 'glib-or-gtk-compile-schemas and 'glib-or-gtk-wrap.
---
gnu/packages/virtualization.scm | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 4e384e79a..5cdf6d09b 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -499,9 +499,12 @@ virtualization library.")
;; Some of the tests seem to require network access to install virtual
;; machines.
#:tests? #f
+ #:imported-modules ((guix build glib-or-gtk-build-system)
+ ,@%python-build-system-modules)
#:modules ((ice-9 match)
(srfi srfi-26)
(guix build python-build-system)
+ ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils))
#:phases
(modify-phases %standard-phases
@@ -528,7 +531,11 @@ virtualization library.")
`("GI_TYPELIB_PATH" ":" prefix
,(filter identity paths))))
bin-files))
- #t)))))
+ #t))
+ (add-after 'install 'glib-or-gtk-compile-schemas
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
+ (add-after 'install 'glib-or-gtk-wrap
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(inputs
`(("gtk+" ,gtk+)
("gtk-vnc" ,gtk-vnc)
--
2.14.2
^ permalink raw reply related [flat|nested] 21+ messages in thread* [bug#28853] [PATCH 1/8] gnu: virt-manager: Enable gtk schemas and glib modules support.
2017-10-19 2:19 ` Andy Patterson
@ 2017-10-26 5:18 ` Ludovic Courtès
0 siblings, 0 replies; 21+ messages in thread
From: Ludovic Courtès @ 2017-10-26 5:18 UTC (permalink / raw)
To: Andy Patterson; +Cc: 28853
Hello,
Andy Patterson <ajpatter@uwaterloo.ca> skribis:
> On Mon, 16 Oct 2017 21:25:18 +0800
> iyzsong@member.fsf.org (宋文武) wrote:
>
>> Andy Patterson <ajpatter@uwaterloo.ca> writes:
>>
>> > virt-manager: Enable gtk schemas and glib modules support.
>>
>> How about: Wrap with GSettings schema and GIO modules search paths.
>>
>> Otherwise, this patch series look good to me, thanks!
>
> Sounds good, updated patch appened:
>
> --
> Andy
>
> From f504ccc9e961e7657261a478e278c142b9006e6b Mon Sep 17 00:00:00 2001
> From: Andy Patterson <ajpatter@uwaterloo.ca>
> Date: Sun, 15 Oct 2017 11:47:16 -0400
> Subject: [PATCH] gnu: virt-manager: Wrap with GSettings schema and GIO modules
> search paths.
>
> Fixes a crash when opening the file chooser dialog.
>
> * gnu/packages/virtualization.scm (virt-manager)[arguments]
> <#:imported-modules>: Add (guix build glib-or-gtk-build-system).
> <#:modules>: Import (guix build glib-or-gtk-build-system) as glib-or-gtk:.
> <#:arguments>: Add 'glib-or-gtk-compile-schemas and 'glib-or-gtk-wrap.
Since we haven’t heard from 宋文武, I went ahead and committed it.
Thanks!
Ludo’.
^ permalink raw reply [flat|nested] 21+ messages in thread
* [bug#28853] [PATCH 2/8] gnu: qemu: Enable spice usb redirection support.
2017-10-15 19:15 [bug#28853] Some virt-manager improvements Andy Patterson
2017-10-15 20:03 ` [bug#28853] [PATCH 1/8] gnu: virt-manager: Enable gtk schemas and glib modules support Andy Patterson
@ 2017-10-15 20:03 ` Andy Patterson
2017-10-16 13:15 ` 宋文武
2017-10-15 20:03 ` [bug#28853] [PATCH 3/8] gnu: spice-gtk: Enable GObject introspection support Andy Patterson
` (5 subsequent siblings)
7 siblings, 1 reply; 21+ messages in thread
From: Andy Patterson @ 2017-10-15 20:03 UTC (permalink / raw)
To: 28853
* gnu/packages/virtualization.scm (qemu)[arguments]<#:configure-flags>: New
argument.
[inputs]: Add usbredir.
(qemu-minimal)[arguments]<#:configure-flags>: Restrict them even when they are
set by qemu.
[inputs]: Remove usbredir.
---
gnu/packages/virtualization.scm | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 5cdf6d09b..24ffc2f28 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
+;;; Copyright © 2017 Andy Patterson <ajpatter@uwaterloo.ca>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -85,7 +86,7 @@
'(;; Running tests in parallel can occasionally lead to failures, like:
;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead)
#:parallel-tests? #f
-
+ #:configure-flags '("--enable-usb-redir")
#:phases
(modify-phases %standard-phases
(replace 'configure
@@ -152,6 +153,7 @@
("pixman" ,pixman)
("sdl" ,sdl)
("spice" ,spice)
+ ("usbredir" ,usbredir)
("util-linux" ,util-linux)
;; ("vde2" ,vde2)
("virglrenderer" ,virglrenderer)
@@ -188,14 +190,17 @@ server and embedded PowerPC, and S390 guests.")
(name "qemu-minimal")
(synopsis "Machine emulator and virtualizer (without GUI)")
(arguments
- `(#:configure-flags
- ;; Restrict to the targets supported by Guix.
- '("--target-list=i386-softmmu,x86_64-softmmu,mips64el-softmmu,arm-softmmu,aarch64-softmmu")
- ,@(package-arguments qemu)))
+ (substitute-keyword-arguments (package-arguments qemu)
+ ((#:configure-flags _ '(list))
+ `(list
+ ,(string-append
+ "--target-list=i386-softmmu,x86_64-softmmu,mips64el-softmmu"
+ ",arm-softmmu,aarch64-softmmu")))))
;; Remove dependencies on optional libraries, notably GUI libraries.
(inputs (fold alist-delete (package-inputs qemu)
- '("libusb" "mesa" "sdl" "spice" "virglrenderer")))))
+ '("libusb" "mesa" "sdl" "spice" "virglrenderer"
+ "usbredir")))))
(define-public libosinfo
(package
--
2.14.2
^ permalink raw reply related [flat|nested] 21+ messages in thread* [bug#28853] [PATCH 2/8] gnu: qemu: Enable spice usb redirection support.
2017-10-15 20:03 ` [bug#28853] [PATCH 2/8] gnu: qemu: Enable spice usb redirection support Andy Patterson
@ 2017-10-16 13:15 ` 宋文武
2017-10-19 2:14 ` Andy Patterson
0 siblings, 1 reply; 21+ messages in thread
From: 宋文武 @ 2017-10-16 13:15 UTC (permalink / raw)
To: Andy Patterson; +Cc: 28853
Andy Patterson <ajpatter@uwaterloo.ca> writes:
> * gnu/packages/virtualization.scm (qemu)[arguments]<#:configure-flags>: New
> argument.
> [inputs]: Add usbredir.
> (qemu-minimal)[arguments]<#:configure-flags>: Restrict them even when they are
> set by qemu.
> [inputs]: Remove usbredir.
Doesn't the 'configure' script auto-detect usb redirection support when
usbredir is available?
> ---
> gnu/packages/virtualization.scm | 17 +++++++++++------
> 1 file changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
> index 5cdf6d09b..24ffc2f28 100644
> --- a/gnu/packages/virtualization.scm
> +++ b/gnu/packages/virtualization.scm
> @@ -4,6 +4,7 @@
> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
> ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
> ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
> +;;; Copyright © 2017 Andy Patterson <ajpatter@uwaterloo.ca>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -85,7 +86,7 @@
> '(;; Running tests in parallel can occasionally lead to failures, like:
> ;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead)
> #:parallel-tests? #f
> -
> + #:configure-flags '("--enable-usb-redir")
In that case, this and ...
> #:phases
> (modify-phases %standard-phases
> (replace 'configure
> @@ -152,6 +153,7 @@
> ("pixman" ,pixman)
> ("sdl" ,sdl)
> ("spice" ,spice)
> + ("usbredir" ,usbredir)
> ("util-linux" ,util-linux)
> ;; ("vde2" ,vde2)
> ("virglrenderer" ,virglrenderer)
> @@ -188,14 +190,17 @@ server and embedded PowerPC, and S390 guests.")
> (name "qemu-minimal")
> (synopsis "Machine emulator and virtualizer (without GUI)")
> (arguments
> - `(#:configure-flags
> - ;; Restrict to the targets supported by Guix.
> - '("--target-list=i386-softmmu,x86_64-softmmu,mips64el-softmmu,arm-softmmu,aarch64-softmmu")
> - ,@(package-arguments qemu)))
> + (substitute-keyword-arguments (package-arguments qemu)
> + ((#:configure-flags _ '(list))
> + `(list
> + ,(string-append
> + "--target-list=i386-softmmu,x86_64-softmmu,mips64el-softmmu"
> + ",arm-softmmu,aarch64-softmmu")))))
>
... can be removed.
^ permalink raw reply [flat|nested] 21+ messages in thread* [bug#28853] [PATCH 2/8] gnu: qemu: Enable spice usb redirection support.
2017-10-16 13:15 ` 宋文武
@ 2017-10-19 2:14 ` Andy Patterson
2017-10-19 9:52 ` Ludovic Courtès
0 siblings, 1 reply; 21+ messages in thread
From: Andy Patterson @ 2017-10-19 2:14 UTC (permalink / raw)
To: 宋文武; +Cc: 28853
Hey 宋文武,
Thanks for the review!
On Mon, 16 Oct 2017 21:15:39 +0800
iyzsong@member.fsf.org (宋文武) wrote:
> Andy Patterson <ajpatter@uwaterloo.ca> writes:
>
> > * gnu/packages/virtualization.scm
> > (qemu)[arguments]<#:configure-flags>: New argument.
> > [inputs]: Add usbredir.
> > (qemu-minimal)[arguments]<#:configure-flags>: Restrict them even
> > when they are set by qemu.
> > [inputs]: Remove usbredir.
>
> Doesn't the 'configure' script auto-detect usb redirection support
> when usbredir is available?
To me, the advantage of specifying the enabled features is that the
build will require the dependencies to be available for that feature
even if they change. So, if more dependencies are required for the
feature in future versions, the build will immediately inform us, rather
than somewhat silently dropping support. Thoughts?
[...]
Thanks,
--
Andy
^ permalink raw reply [flat|nested] 21+ messages in thread
* [bug#28853] [PATCH 2/8] gnu: qemu: Enable spice usb redirection support.
2017-10-19 2:14 ` Andy Patterson
@ 2017-10-19 9:52 ` Ludovic Courtès
0 siblings, 0 replies; 21+ messages in thread
From: Ludovic Courtès @ 2017-10-19 9:52 UTC (permalink / raw)
To: Andy Patterson; +Cc: 28853
[-- Attachment #1: Type: text/plain, Size: 1081 bytes --]
Hello,
Andy Patterson <ajpatter@uwaterloo.ca> skribis:
> On Mon, 16 Oct 2017 21:15:39 +0800
> iyzsong@member.fsf.org (宋文武) wrote:
>
>> Andy Patterson <ajpatter@uwaterloo.ca> writes:
>>
>> > * gnu/packages/virtualization.scm
>> > (qemu)[arguments]<#:configure-flags>: New argument.
>> > [inputs]: Add usbredir.
>> > (qemu-minimal)[arguments]<#:configure-flags>: Restrict them even
>> > when they are set by qemu.
>> > [inputs]: Remove usbredir.
>>
>> Doesn't the 'configure' script auto-detect usb redirection support
>> when usbredir is available?
>
> To me, the advantage of specifying the enabled features is that the
> build will require the dependencies to be available for that feature
> even if they change. So, if more dependencies are required for the
> feature in future versions, the build will immediately inform us, rather
> than somewhat silently dropping support. Thoughts?
That makes sense to me.
I took the liberty to make the change below, to avoid a rebuild of
‘qemu-minimal’, and applied it.
Thanks,
Ludo’.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 830 bytes --]
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 4a711ee7f..49dee07f5 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -192,10 +192,8 @@ server and embedded PowerPC, and S390 guests.")
(arguments
(substitute-keyword-arguments (package-arguments qemu)
((#:configure-flags _ '(list))
- `(list
- ,(string-append
- "--target-list=i386-softmmu,x86_64-softmmu,mips64el-softmmu"
- ",arm-softmmu,aarch64-softmmu")))))
+ ;; Restrict to the targets supported by Guix.
+ ''("--target-list=i386-softmmu,x86_64-softmmu,mips64el-softmmu,arm-softmmu,aarch64-softmmu"))))
;; Remove dependencies on optional libraries, notably GUI libraries.
(inputs (fold alist-delete (package-inputs qemu)
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [bug#28853] [PATCH 3/8] gnu: spice-gtk: Enable GObject introspection support.
2017-10-15 19:15 [bug#28853] Some virt-manager improvements Andy Patterson
2017-10-15 20:03 ` [bug#28853] [PATCH 1/8] gnu: virt-manager: Enable gtk schemas and glib modules support Andy Patterson
2017-10-15 20:03 ` [bug#28853] [PATCH 2/8] gnu: qemu: Enable spice usb redirection support Andy Patterson
@ 2017-10-15 20:03 ` Andy Patterson
2017-10-19 9:56 ` Ludovic Courtès
2017-10-15 20:03 ` [bug#28853] [PATCH 4/8] gnu: virt-manager: Enable spice-gtk support Andy Patterson
` (4 subsequent siblings)
7 siblings, 1 reply; 21+ messages in thread
From: Andy Patterson @ 2017-10-15 20:03 UTC (permalink / raw)
To: 28853
Allows virt-manager to use the spice-gtk widget.
* gnu/packages/spice.scm (spice-gtk)[inputs]: Add gobject-introspection.
[arguments]<#:configure-flags>: Add --enable-introspection.
---
gnu/packages/spice.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm
index 8e3c5e2b7..7d49f90be 100644
--- a/gnu/packages/spice.scm
+++ b/gnu/packages/spice.scm
@@ -162,6 +162,7 @@ which allows users to view a desktop computing environment.")
("spice-protocol" ,spice-protocol)))
(inputs
`(("glib-networking" ,glib-networking)
+ ("gobject-introspection" ,gobject-introspection)
("gtk+" ,gtk+)
("libepoxy" ,libepoxy)
("libjpeg" ,libjpeg)
@@ -182,7 +183,8 @@ which allows users to view a desktop computing environment.")
`(#:configure-flags
'("--enable-gstaudio"
"--enable-gstvideo"
- "--enable-pulse")
+ "--enable-pulse"
+ "--enable-introspection")
#:phases
(modify-phases %standard-phases
(add-after
--
2.14.2
^ permalink raw reply related [flat|nested] 21+ messages in thread* [bug#28853] [PATCH 4/8] gnu: virt-manager: Enable spice-gtk support.
2017-10-15 19:15 [bug#28853] Some virt-manager improvements Andy Patterson
` (2 preceding siblings ...)
2017-10-15 20:03 ` [bug#28853] [PATCH 3/8] gnu: spice-gtk: Enable GObject introspection support Andy Patterson
@ 2017-10-15 20:03 ` Andy Patterson
2017-10-19 9:57 ` Ludovic Courtès
2017-10-15 20:03 ` [bug#28853] [PATCH 5/8] gnu: qemu: Add OpenGL support Andy Patterson
` (3 subsequent siblings)
7 siblings, 1 reply; 21+ messages in thread
From: Andy Patterson @ 2017-10-15 20:03 UTC (permalink / raw)
To: 28853
* gnu/packages/virtualization.scm (virt-manager)[inputs]: Add spice-gtk.
---
gnu/packages/virtualization.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 24ffc2f28..1c69c4a97 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -553,7 +553,8 @@ virtualization library.")
("python2-requests" ,python2-requests)
("python2-ipaddr" ,python2-ipaddr)
("python2-pygobject" ,python2-pygobject)
- ("python2-libxml2" ,python2-libxml2)))
+ ("python2-libxml2" ,python2-libxml2)
+ ("spice-gtk" ,spice-gtk)))
;; virt-manager searches for qemu-img or kvm-img in the PATH.
(propagated-inputs
`(("qemu" ,qemu)))
--
2.14.2
^ permalink raw reply related [flat|nested] 21+ messages in thread* [bug#28853] [PATCH 5/8] gnu: qemu: Add OpenGL support.
2017-10-15 19:15 [bug#28853] Some virt-manager improvements Andy Patterson
` (3 preceding siblings ...)
2017-10-15 20:03 ` [bug#28853] [PATCH 4/8] gnu: virt-manager: Enable spice-gtk support Andy Patterson
@ 2017-10-15 20:03 ` Andy Patterson
2017-10-19 9:59 ` Ludovic Courtès
2017-10-15 20:03 ` [bug#28853] [PATCH 6/8] gnu: virt-manager: Enable statistics graphing support Andy Patterson
` (2 subsequent siblings)
7 siblings, 1 reply; 21+ messages in thread
From: Andy Patterson @ 2017-10-15 20:03 UTC (permalink / raw)
To: 28853
Enables virgl support with spice 0.13+.
* gnu/packages/virtualization.scm (qemu)[arguments]<#:configure-flags>: Add
--enable-opengl.
[inputs]: Add libdrm and libepoxy.
(qemu-minimal)[inputs]: Remove libdrm and libepoxy.
---
gnu/packages/virtualization.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 1c69c4a97..62ba7811e 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -86,7 +86,7 @@
'(;; Running tests in parallel can occasionally lead to failures, like:
;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead)
#:parallel-tests? #f
- #:configure-flags '("--enable-usb-redir")
+ #:configure-flags '("--enable-usb-redir" "--enable-opengl")
#:phases
(modify-phases %standard-phases
(replace 'configure
@@ -144,6 +144,8 @@
("libaio" ,libaio)
("libattr" ,attr)
("libcap" ,libcap) ; virtfs support requires libcap & libattr
+ ("libdrm" ,libdrm)
+ ("libepoxy" ,libepoxy)
("libjpeg" ,libjpeg-8)
("libpng" ,libpng)
("libusb" ,libusb) ;USB pass-through support
@@ -200,7 +202,7 @@ server and embedded PowerPC, and S390 guests.")
;; Remove dependencies on optional libraries, notably GUI libraries.
(inputs (fold alist-delete (package-inputs qemu)
'("libusb" "mesa" "sdl" "spice" "virglrenderer"
- "usbredir")))))
+ "usbredir" "libdrm" "libepoxy")))))
(define-public libosinfo
(package
--
2.14.2
^ permalink raw reply related [flat|nested] 21+ messages in thread* [bug#28853] [PATCH 6/8] gnu: virt-manager: Enable statistics graphing support.
2017-10-15 19:15 [bug#28853] Some virt-manager improvements Andy Patterson
` (4 preceding siblings ...)
2017-10-15 20:03 ` [bug#28853] [PATCH 5/8] gnu: qemu: Add OpenGL support Andy Patterson
@ 2017-10-15 20:03 ` Andy Patterson
2017-10-19 9:59 ` Ludovic Courtès
2017-10-15 20:03 ` [bug#28853] [PATCH 7/8] gnu: virt-manager: Fix default URI check Andy Patterson
2017-10-15 20:03 ` [bug#28853] [PATCH 8/8] gnu: virt-manager: Enable persistent configuration support Andy Patterson
7 siblings, 1 reply; 21+ messages in thread
From: Andy Patterson @ 2017-10-15 20:03 UTC (permalink / raw)
To: 28853
* gnu/packages/virtualization.scm (virt-manager)[inputs]: Add
python2-pycairo.
---
gnu/packages/virtualization.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 62ba7811e..f2494f74f 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -554,6 +554,7 @@ virtualization library.")
("python2-libvirt" ,python2-libvirt)
("python2-requests" ,python2-requests)
("python2-ipaddr" ,python2-ipaddr)
+ ("python2-pycairo" ,python2-pycairo)
("python2-pygobject" ,python2-pygobject)
("python2-libxml2" ,python2-libxml2)
("spice-gtk" ,spice-gtk)))
--
2.14.2
^ permalink raw reply related [flat|nested] 21+ messages in thread* [bug#28853] [PATCH 7/8] gnu: virt-manager: Fix default URI check.
2017-10-15 19:15 [bug#28853] Some virt-manager improvements Andy Patterson
` (5 preceding siblings ...)
2017-10-15 20:03 ` [bug#28853] [PATCH 6/8] gnu: virt-manager: Enable statistics graphing support Andy Patterson
@ 2017-10-15 20:03 ` Andy Patterson
2017-10-19 10:01 ` Ludovic Courtès
2017-10-15 20:03 ` [bug#28853] [PATCH 8/8] gnu: virt-manager: Enable persistent configuration support Andy Patterson
7 siblings, 1 reply; 21+ messages in thread
From: Andy Patterson @ 2017-10-15 20:03 UTC (permalink / raw)
To: 28853
Allows virt-manager to connect to qemu://system by default.
* gnu/packages/virtualization.scm (virt-manager)[arguments]<#:phases>: Add
'fix-default-uri.
---
gnu/packages/virtualization.scm | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index f2494f74f..bdf9c8274 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -520,6 +520,13 @@ virtualization library.")
(substitute* "virtcli/cliconfig.py"
(("/usr") (assoc-ref outputs "out")))
#t))
+ (add-after 'unpack 'fix-default-uri
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; xen is not available for now - so only patch qemu
+ (substitute* "virtManager/connect.py"
+ (("/usr(/bin/qemu-system)" _ suffix)
+ (string-append (assoc-ref inputs "qemu") suffix)))
+ #t))
(add-before 'wrap 'wrap-with-GI_TYPELIB_PATH
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((bin (string-append (assoc-ref outputs "out") "/bin"))
--
2.14.2
^ permalink raw reply related [flat|nested] 21+ messages in thread* [bug#28853] [PATCH 7/8] gnu: virt-manager: Fix default URI check.
2017-10-15 20:03 ` [bug#28853] [PATCH 7/8] gnu: virt-manager: Fix default URI check Andy Patterson
@ 2017-10-19 10:01 ` Ludovic Courtès
0 siblings, 0 replies; 21+ messages in thread
From: Ludovic Courtès @ 2017-10-19 10:01 UTC (permalink / raw)
To: Andy Patterson; +Cc: 28853
Andy Patterson <ajpatter@uwaterloo.ca> skribis:
> Allows virt-manager to connect to qemu://system by default.
>
> * gnu/packages/virtualization.scm (virt-manager)[arguments]<#:phases>: Add
> 'fix-default-uri.
Applied.
There are only two patches left. 宋文武, I’ll let you conclude with
these two patches since you already started reviewing #1 (which #8
depends on); let me know if you’d prefer to let me take care of these.
Thanks Andy for all these improvements!
Ludo’.
^ permalink raw reply [flat|nested] 21+ messages in thread
* [bug#28853] [PATCH 8/8] gnu: virt-manager: Enable persistent configuration support.
2017-10-15 19:15 [bug#28853] Some virt-manager improvements Andy Patterson
` (6 preceding siblings ...)
2017-10-15 20:03 ` [bug#28853] [PATCH 7/8] gnu: virt-manager: Fix default URI check Andy Patterson
@ 2017-10-15 20:03 ` Andy Patterson
2017-10-26 5:22 ` bug#28853: " Ludovic Courtès
7 siblings, 1 reply; 21+ messages in thread
From: Andy Patterson @ 2017-10-15 20:03 UTC (permalink / raw)
To: 28853
* gnu/packages/virtualization.scm (virt-manager)[inputs]: Add dconf.
---
gnu/packages/virtualization.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index bdf9c8274..be8681d4e 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -551,7 +551,8 @@ virtualization library.")
(add-after 'install 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(inputs
- `(("gtk+" ,gtk+)
+ `(("dconf" ,dconf)
+ ("gtk+" ,gtk+)
("gtk-vnc" ,gtk-vnc)
("libvirt" ,libvirt)
("libvirt-glib" ,libvirt-glib)
--
2.14.2
^ permalink raw reply related [flat|nested] 21+ messages in thread