gnu: libva: Build with wayland support.

* gnu/packages/video.scm (libva)[inputs]: Add wayland.
* gnu/packages/gl.scm (libva-without-mesa)[inputs]: Remove wayland.
This commit is contained in:
Efraim Flashner 2018-05-01 19:04:49 +03:00
parent 6e339db06e
commit 3ee7b4cc9b
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
2 changed files with 6 additions and 3 deletions

View file

@ -55,7 +55,8 @@ (define-module (gnu packages gl)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (ice-9 match)) #:use-module (ice-9 match)
#:use-module (srfi srfi-1))
(define-public glu (define-public glu
(package (package
@ -211,7 +212,8 @@ (define libva-without-mesa
(package (package
(inherit libva) (inherit libva)
(name "libva-without-mesa") (name "libva-without-mesa")
(inputs (alist-delete "mesa" (package-inputs libva))) (inputs `(,@(fold alist-delete (package-inputs libva)
'("mesa" "wayland"))))
(arguments (arguments
(strip-keyword-arguments (strip-keyword-arguments
'(#:make-flags) '(#:make-flags)

View file

@ -564,7 +564,8 @@ (define-public libva
("libx11" ,libx11) ("libx11" ,libx11)
("libxext" ,libxext) ("libxext" ,libxext)
("libxfixes" ,libxfixes) ("libxfixes" ,libxfixes)
("mesa" ,mesa))) ("mesa" ,mesa)
("wayland" ,wayland)))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases