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 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gl.scm') 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) -- cgit v1.2.3 From af403cf0e89f24b9a58b19c740eaaddc8d0e6ad7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 1 May 2018 19:29:38 +0300 Subject: gnu: gl.scm: Don't import 'zip' from srfi-1. * gnu/packages/gl.scm: Hide 'zip' when importing srfi-1. --- gnu/packages/gl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index dc9f35c7b4..2e71216f2a 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -56,7 +56,7 @@ #:use-module (guix packages) #:use-module (guix utils) #:use-module (ice-9 match) - #:use-module (srfi srfi-1)) + #:use-module ((srfi srfi-1) #:hide (zip))) (define-public glu (package -- cgit v1.2.3