nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: spice: Fix usbredir for 32 bit platforms. 

* gnu/packages/spice.scm (usbredir)[origin]: Fetch source from git repo.
  [native-inputs]: Add AUTOCONF, AUTOMAKE and LIBTOOL.
  [arguments]: Add autogen phase.
This commit is contained in:
David Craven 2016-08-08 13:36:41 +02:00
parent 19c3304072
commit 37d52f6e46
No known key found for this signature in database
GPG Key ID: C5E051C79C0BECDB
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gnu/packages/spice.scm
View File

@ -18,6 +18,7 @@
(define-module (gnu packages spice) (define-module (gnu packages spice)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages autotools) ; remove after updating usbredir to 0.7.1+
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
@ -37,6 +38,7 @@
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) ; remove after updating usbredir to 0.7.1+
#:use-module (guix packages) #:use-module (guix packages)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix utils)) #:use-module (guix utils))
@ -45,19 +47,39 @@
(package (package
(name "usbredir") (name "usbredir")
(version "0.7.1") (version "0.7.1")
;(source (origin
; (method url-fetch)
; (uri (string-append
; "http://spice-space.org/download/usbredir/"
; "usbredir-" version ".tar.bz2"))
; (sha256
; (base32
; "1wsnmk4wjpdhbn1zaxg6bmyxspcki2zgy0am9lk037rnl4krwzj0"))))
; FIXME: usbredir 0.7.1 release doesn't build on 32 bit systems.
; issue is fixed in HEAD
; remove 'autogen phase and autoconf, automake, libtool inputs
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append (uri (git-reference
"http://spice-space.org/download/usbredir/" (url "http://cgit.freedesktop.org/spice/usbredir")
"usbredir-" version ".tar.bz2")) (commit "ac80a5971c6318d73d5fba4b5f13d3a9389558c9")))
(sha256 (sha256
(base32 (base32
"1wsnmk4wjpdhbn1zaxg6bmyxspcki2zgy0am9lk037rnl4krwzj0")))) "052fywgi72j68dr5ybldncg4vk8iqfrh58la7iazyxxpph9aag1g"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("libusb" ,libusb))) `(("libusb" ,libusb)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)
("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'autogen
(lambda* _
(system* "sh" "autogen.sh"))))))
(synopsis "Tools for sending USB device traffic over a network") (synopsis "Tools for sending USB device traffic over a network")
(description "Usbredir is a network protocol for sending USB device traffic (description "Usbredir is a network protocol for sending USB device traffic
over a network connection. It can be used to redirect traffic from a USB device over a network connection. It can be used to redirect traffic from a USB device