aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorRutger Helling <rhelling@mykolab.com>2017-12-12 10:28:24 +0100
committerLudovic Courtès <ludo@gnu.org>2017-12-14 18:26:25 +0100
commita0ec2d256d0e7352f31eb2adc4c18c40e420a419 (patch)
tree3df748548e341d8da01d159d9d561866bd2b7d19 /gnu
parent97c26793d94fe95c51de21fd98bc5cab2f1425a7 (diff)
downloadguix-a0ec2d256d0e7352f31eb2adc4c18c40e420a419.tar
guix-a0ec2d256d0e7352f31eb2adc4c18c40e420a419.tar.gz
gnu: xpra: Update to 2.2.
* gnu/packages/xorg.scm (xpra): Update to 2.2. [inputs]: Add python2-netifaces and python2-pyopengl-accelerate. Fix position of commas. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/xorg.scm55
1 files changed, 28 insertions, 27 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index d70226930f..b9e469a121 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5952,7 +5952,7 @@ basic eye-candy effects.")
(define-public xpra
(package
(name "xpra")
- (version "2.1.3")
+ (version "2.2")
(source
(origin
(method url-fetch)
@@ -5960,41 +5960,42 @@ basic eye-candy effects.")
version ".tar.xz"))
(sha256
(base32
- "0r0l3p59q05fmvkp3jv8vmny2v8m1vyhqkg6b9r2qgxn1kcxx7rm"))))
+ "0gi0i5pbhfzr5j4mbngjxvrk6r4lvigw4w2104znplmmrf1mw6y2"))))
(build-system python-build-system)
- (inputs `(("ffmpeg", ffmpeg)
- ("flac", flac)
+ (inputs `(("ffmpeg" ,ffmpeg)
+ ("flac" ,flac)
("gtk+-2" ,gtk+-2) ;; no full GTK3 support yet
- ("libjpeg", libjpeg)
- ("libpng", libpng)
- ("libvpx", libvpx)
- ("libx264", libx264)
- ("libxcomposite", libxcomposite)
- ("libxdamage", libxdamage)
- ("libxkbfile", libxkbfile)
- ("libxrandr", libxrandr)
- ("libxtst", libxtst)
- ("lzo", lzo)
- ("python2-cryptography", python2-cryptography)
- ("python2-dbus", python2-dbus)
- ("python2-lz4", python2-lz4)
- ("python2-lzo", python2-lzo)
- ("python2-numpy", python2-numpy)
+ ("libjpeg" ,libjpeg)
+ ("libpng" ,libpng)
+ ("libvpx" ,libvpx)
+ ("libx264" ,libx264)
+ ("libxcomposite" ,libxcomposite)
+ ("libxdamage" ,libxdamage)
+ ("libxkbfile" ,libxkbfile)
+ ("libxrandr" ,libxrandr)
+ ("libxtst" ,libxtst)
+ ("lzo" ,lzo)
+ ("python2-cryptography" ,python2-cryptography)
+ ("python2-dbus" ,python2-dbus)
+ ("python2-lz4" ,python2-lz4)
+ ("python2-lzo" ,python2-lzo)
+ ("python2-netifaces" ,python2-netifaces)
+ ("python2-numpy" ,python2-numpy)
("python2-pillow" ,python2-pillow)
- ("python2-pycairo", python2-pycairo)
- ("python2-pycrypto", python2-pycrypto)
- ("python2-pygobject", python2-pygobject)
- ("python2-pyopengl", python2-pyopengl)
- ("python2-pygtk", python2-pygtk)
- ("python2-rencode", python2-rencode)
- ("xorg-server", xorg-server)))
+ ("python2-pycairo" ,python2-pycairo)
+ ("python2-pycrypto" ,python2-pycrypto)
+ ("python2-pygobject" ,python2-pygobject)
+ ("python2-pyopengl" ,python2-pyopengl)
+ ("python2-pyopengl-accelerate" ,python2-pyopengl-accelerate)
+ ("python2-pygtk" ,python2-pygtk)
+ ("python2-rencode" ,python2-rencode)
+ ("xorg-server" ,xorg-server)))
(native-inputs `(("pkg-config" ,pkg-config)
("python2-cython", python2-cython)))
(arguments
`(#:python ,python-2 ;; no full Python 3 support yet
#:configure-flags '("--with-tests"
"--with-bundle_tests"
- "--without-opengl" ;; TODO: pygtkglext needed.
"--without-Xdummy" ;; We use Xvfb instead.
"--without-Xdummy_wrapper"
"--without-strict")