aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorThomas Danckaert <thomas.danckaert@gmail.com>2017-08-18 12:36:19 +0200
committerThomas Danckaert <thomas.danckaert@gmail.com>2017-08-18 14:52:35 +0200
commit598b5481a462509638004728122a42cc9e3ac502 (patch)
tree48111c6615674d863c3cb888c19c133ed6232eab /gnu
parentcc81f1c3495e81cc738b486e1ef2b4a1dbe99e28 (diff)
downloadguix-598b5481a462509638004728122a42cc9e3ac502.tar
guix-598b5481a462509638004728122a42cc9e3ac502.tar.gz
gnu: freerdp: Update inputs.
* gnu/packages/rdesktop.scm (freerdp) [native-inputs]: Add libxslt, libxml2 and docbook-xsl. [inputs]: Add libjpeg, remove gstreamer, gst-plugins-base, libxml2 and libxslt. [arguments]: Enable features JPEG and SSE2 (on x86_64), and set up docbook-xsl.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/rdesktop.scm27
1 files changed, 20 insertions, 7 deletions
diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index 7c2b8911b7..65d17de637 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -26,7 +26,9 @@
#:use-module (guix build-system gnu)
#:use-module (gnu packages compression)
#:use-module (gnu packages cups)
+ #:use-module (gnu packages docbook)
#:use-module (gnu packages gstreamer)
+ #:use-module (gnu packages image)
#:use-module (gnu packages linux)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio)
@@ -86,6 +88,9 @@ to remotely control a user's Windows desktop.")
(build-system cmake-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
+ ("libxslt" ,libxslt)
+ ("libxml2" ,libxml2)
+ ("docbook-xsl" ,docbook-xsl)
("xmlto" ,xmlto)))
(inputs
`(("libx11" ,libx11)
@@ -98,21 +103,29 @@ to remotely control a user's Windows desktop.")
("libxrender" ,libxrender)
("libxinerama" ,libxinerama)
("libxshmfence" ,libxshmfence)
- ("libxml2" ,libxml2)
- ("libxslt" ,libxslt)
("cups" ,cups)
("ffmpeg" ,ffmpeg-2.8)
+ ("libjpeg" ,libjpeg)
("pulseaudio" ,pulseaudio)
("alsa-lib" ,alsa-lib)
- ("gstreamer" ,gstreamer)
- ("gst-plugins-base" ,gst-plugins-base)
("zlib" ,zlib)
("openssl" ,openssl)))
(arguments
`(#:configure-flags
- '("-DCMAKE_INSTALL_LIBDIR=lib"
- "-DWITH_PULSE=ON"
- "-DWITH_CUPS=ON")
+ (list "-DCMAKE_INSTALL_LIBDIR=lib"
+ "-DCMAKE_BUILD_TYPE=RELEASE"
+ "-DWITH_JPEG=ON"
+ ,@(if (string-prefix? "x86_64"
+ (or (%current-target-system)
+ (%current-system)))
+ '("-DWITH_SSE2=ON")
+ '())
+ (string-append "-DDOCBOOKXSL_DIR="
+ (assoc-ref %build-inputs "docbook-xsl")
+ "/xml/xsl/docbook-xsl-"
+ ,(package-version docbook-xsl))
+ "-DWITH_PULSE=ON"
+ "-DWITH_CUPS=ON")
#:tests? #f)) ; no 'test' target
(home-page "https://www.freerdp.com")
(synopsis "Remote Desktop Protocol implementation")