diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-12-19 01:42:40 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-12-19 01:42:40 +0100 |
| commit | 32cd878be0bb7e153fcaa6f3bfa2632867390ff9 (patch) | |
| tree | fc1ff93949817c9d172c84d0410ac9225cad57ae /gnu/packages/xorg.scm | |
| parent | 753425610274ccb59cce13490c096027c61621d0 (diff) | |
| parent | 98bd11cfe7b931e9c6d6bf002a8a225fb7a1025b (diff) | |
| download | guix-32cd878be0bb7e153fcaa6f3bfa2632867390ff9.tar guix-32cd878be0bb7e153fcaa6f3bfa2632867390ff9.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/xorg.scm')
| -rw-r--r-- | gnu/packages/xorg.scm | 55 |
1 files changed, 28 insertions, 27 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 4ed2c010c4..bbf7e0a5f6 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5920,7 +5920,7 @@ basic eye-candy effects.") (define-public xpra (package (name "xpra") - (version "2.1.3") + (version "2.2") (source (origin (method url-fetch) @@ -5928,41 +5928,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") |