diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2018-05-01 19:04:49 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2018-05-01 19:06:39 +0300 |
| commit | 3ee7b4cc9b33ea64733606df66d86d275eb45e8e (patch) | |
| tree | 8f1358cf70819f19624ae15afe21b8c2ff0f2b2d | |
| parent | 6e339db06ee4f14375c11f544fa166fdae045aca (diff) | |
| download | guix-3ee7b4cc9b33ea64733606df66d86d275eb45e8e.tar.gz guix-3ee7b4cc9b33ea64733606df66d86d275eb45e8e.zip | |
gnu: libva: Build with wayland support.
* gnu/packages/video.scm (libva)[inputs]: Add wayland.
* gnu/packages/gl.scm (libva-without-mesa)[inputs]: Remove wayland.
| -rw-r--r-- | gnu/packages/gl.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/video.scm | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index db02d798f5..dc9f35c7b4 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -55,7 +55,8 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) - #:use-module (ice-9 match)) + #:use-module (ice-9 match) + #:use-module (srfi srfi-1)) (define-public glu (package @@ -211,7 +212,8 @@ also known as DXTn or DXTC) for Mesa.") (package (inherit libva) (name "libva-without-mesa") - (inputs (alist-delete "mesa" (package-inputs libva))) + (inputs `(,@(fold alist-delete (package-inputs libva) + '("mesa" "wayland")))) (arguments (strip-keyword-arguments '(#:make-flags) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 58fd35558c..94b51fcbcc 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -564,7 +564,8 @@ libebml is a C++ library to read and write EBML files.") ("libx11" ,libx11) ("libxext" ,libxext) ("libxfixes" ,libxfixes) - ("mesa" ,mesa))) + ("mesa" ,mesa) + ("wayland" ,wayland))) (arguments `(#:phases (modify-phases %standard-phases |