ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: freerdp: Update inputs.

Browse source 
* 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.
This commit is contained in:
Thomas Danckaert 2017-08-18 12:36:19 +02:00
parent cc81f1c349
commit 598b5481a4
No known key found for this signature in database
GPG key ID: 5C3B064C724A5726
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gnu/packages/rdesktop.scm
View file

@ -26,7 +26,9 @@ (define-module (gnu packages rdesktop)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cups) #:use-module (gnu packages cups)
#:use-module (gnu packages docbook)
#:use-module (gnu packages gstreamer) #:use-module (gnu packages gstreamer)
#:use-module (gnu packages image)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio) #:use-module (gnu packages pulseaudio)
@ -86,6 +88,9 @@ (define-public freerdp
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("libxslt" ,libxslt)
("libxml2" ,libxml2)
("docbook-xsl" ,docbook-xsl)
("xmlto" ,xmlto))) ("xmlto" ,xmlto)))
(inputs (inputs
`(("libx11" ,libx11) `(("libx11" ,libx11)
@ -98,19 +103,27 @@ (define-public freerdp
("libxrender" ,libxrender) ("libxrender" ,libxrender)
("libxinerama" ,libxinerama) ("libxinerama" ,libxinerama)
("libxshmfence" ,libxshmfence) ("libxshmfence" ,libxshmfence)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
("cups" ,cups) ("cups" ,cups)
("ffmpeg" ,ffmpeg-2.8) ("ffmpeg" ,ffmpeg-2.8)
("libjpeg" ,libjpeg)
("pulseaudio" ,pulseaudio) ("pulseaudio" ,pulseaudio)
("alsa-lib" ,alsa-lib) ("alsa-lib" ,alsa-lib)
("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base)
("zlib" ,zlib) ("zlib" ,zlib)
("openssl" ,openssl))) ("openssl" ,openssl)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
'("-DCMAKE_INSTALL_LIBDIR=lib" (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_PULSE=ON"
"-DWITH_CUPS=ON") "-DWITH_CUPS=ON")
#:tests? #f)) ; no 'test' target #:tests? #f)) ; no 'test' target