;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 David Craven <david@craven.ch>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
+;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
(define-public spice-protocol
(package
(name "spice-protocol")
- (version "0.12.14")
+ (version "0.14.0")
(source (origin
(method url-fetch)
(uri (string-append
"spice-protocol-" version ".tar.bz2"))
(sha256
(base32
- "170ckpgazvqv7hxy209myg67pqnd6c0gvr4ysbqgsfch6320nd90"))))
+ "1b3f44c13pqsp7aabmcinfbmgl79038bp5548l5pjs16lcfam95n"))))
(build-system gnu-build-system)
(synopsis "Protocol headers for the SPICE protocol")
(description "SPICE (the Simple Protocol for Independent Computing
(define-public spice-gtk
(package
(name "spice-gtk")
- (version "0.35")
+ (version "0.37")
(source (origin
(method url-fetch)
(uri (string-append
"spice-gtk-" version ".tar.bz2"))
(sha256
(base32
- "11lymg467gvj5ys8k22ihnfbxjn4x34ygyzirpg2nphjwlyhgrml"))))
+ "1drvj8y35gnxbnrxsipwi15yh0vs9ixzv4wslz6r3lra8w3bfa0z"))))
(build-system gnu-build-system)
(propagated-inputs
`(("gstreamer" ,gstreamer)
("gst-plugins-good" ,gst-plugins-good)
("gst-plugins-bad" ,gst-plugins-bad)
("gst-plugins-ugly" ,gst-plugins-ugly)
- ("spice-protocol" ,spice-protocol)))
+ ("spice-protocol" ,spice-protocol)
+
+ ;; These are required by the pkg-config files.
+ ("gtk+" ,gtk+)
+ ("pixman" ,pixman)
+ ("openssl" ,openssl)))
(inputs
`(("glib-networking" ,glib-networking)
("gobject-introspection" ,gobject-introspection)
- ("gtk+" ,gtk+)
+ ("json-glib" ,json-glib)
("libepoxy" ,libepoxy)
("libjpeg" ,libjpeg)
("libxcb" ,libxcb)
("lz4" ,lz4)
("mesa" ,mesa)
- ("pixman" ,pixman)
("pulseaudio" ,pulseaudio)
("python" ,python)
- ("openssl" ,openssl)
("opus" ,opus)
("usbredir" ,usbredir)))
(native-inputs
`(("glib:bin" ,glib "bin")
("intltool" ,intltool)
- ("pkg-config" ,pkg-config)))
+ ("pkg-config" ,pkg-config)
+ ("vala" ,vala)))
(arguments
`(#:configure-flags
'("--enable-gstaudio"
"--enable-gstvideo"
"--enable-pulse"
+ "--enable-vala"
"--enable-introspection")
#:phases
(modify-phases %standard-phases
+ (add-before 'check 'disable-session-test
+ (lambda _
+ ;; XXX: Disable session tests, because they require USB support,
+ ;; which is not available in the build container.
+ (substitute* "tests/Makefile"
+ (("test-session\\$\\(EXEEXT\\) ") ""))
+ #t))
(add-after
'install 'wrap-spicy
(lambda* (#:key inputs outputs #:allow-other-keys)
(define-public spice
(package
(name "spice")
- (version "0.14.1")
+ (version "0.14.2")
(source (origin
(method url-fetch)
(uri (string-append
"spice-server/spice-" version ".tar.bz2"))
(sha256
(base32
- "068mb9l7wzk4k4c65bzvpw5fyyzh81rb6z81skgdxvh67pk5vb8y"))))
+ "19r999py9v9c7md2bb8ysj809ag1hh6djl1ik8jcgx065s4b60xj"))))
(build-system gnu-build-system)
(propagated-inputs
`(("openssl" ,openssl)
`(#:configure-flags
'("--enable-lz4"
"--enable-automated-tests")
- #:phases (modify-phases %standard-phases
- (add-before 'check 'use-empty-ssl-cert-file
- (lambda _ (setenv "SSL_CERT_FILE" "/dev/null") #t)))))
+
+ ;; Several tests appear to be opening the same sockets concurrently.
+ #:parallel-tests? #f))
(synopsis "Server implementation of the SPICE protocol")
(description "SPICE is a remote display system built for virtual
-environments which allows you to view a computing 'desktop' environment
+environments which allows you to view a computing @code{desktop} environment
not only on the machine where it is running, but from anywhere on the
Internet and from a wide variety of machine architectures.")
(home-page "https://www.spice-space.org")
(add-after 'unpack 'patch-spice-vdagent.desktop
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "data/spice-vdagent.desktop"
- (("Exec=/usr/bin/spice-vdagent\n")
+ (("Exec=/usr/bin/spice-vdagent")
(string-append "Exec=" (assoc-ref outputs "out")
"/bin/spice-vdagent")))
#t)))))
`(("gtk+" ,gtk+)
("libcap" ,libcap)
("libxml2" ,libxml2)
- ("openssl" ,openssl)
("spice-gtk" ,spice-gtk)))
(native-inputs
`(("glib:bin" ,glib "bin")