From 3ee7b4cc9b33ea64733606df66d86d275eb45e8e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 1 May 2018 19:04:49 +0300 Subject: gnu: libva: Build with wayland support. * gnu/packages/video.scm (libva)[inputs]: Add wayland. * gnu/packages/gl.scm (libva-without-mesa)[inputs]: Remove wayland. --- gnu/packages/gl.scm | 6 ++++-- gnu/packages/video.scm | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') 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 @@ (define-module (gnu packages gl) #: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 @@ (define libva-without-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 @@ (define-public libva ("libx11" ,libx11) ("libxext" ,libxext) ("libxfixes" ,libxfixes) - ("mesa" ,mesa))) + ("mesa" ,mesa) + ("wayland" ,wayland))) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3