From 6cbee49d6668eb7fd738080666f66febfce8c7e8 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 16 Mar 2018 07:47:34 -0400 Subject: gnu: All snippets report errors using exceptions, else return #t. * gnu/packages/admin.scm, gnu/packages/algebra.scm, gnu/packages/audio.scm, gnu/packages/backup.scm, gnu/packages/base.scm, gnu/packages/bioinformatics.scm, gnu/packages/cdrom.scm, gnu/packages/chez.scm, gnu/packages/code.scm, gnu/packages/compression.scm, gnu/packages/cross-base.scm, gnu/packages/crypto.scm, gnu/packages/cups.scm, gnu/packages/databases.scm, gnu/packages/dns.scm, gnu/packages/emacs.scm, gnu/packages/emulators.scm, gnu/packages/engineering.scm, gnu/packages/enlightenment.scm, gnu/packages/fpga.scm, gnu/packages/freedesktop.scm, gnu/packages/ftp.scm, gnu/packages/games.scm, gnu/packages/gcc.scm, gnu/packages/geo.scm, gnu/packages/ghostscript.scm, gnu/packages/gl.scm, gnu/packages/glib.scm, gnu/packages/gnome.scm, gnu/packages/gnuzilla.scm, gnu/packages/graphics.scm, gnu/packages/gtk.scm, gnu/packages/guile.scm, gnu/packages/irc.scm, gnu/packages/java.scm, gnu/packages/kerberos.scm, gnu/packages/linux.scm, gnu/packages/lisp.scm, gnu/packages/lxde.scm, gnu/packages/machine-learning.scm, gnu/packages/mail.scm, gnu/packages/maths.scm, gnu/packages/messaging.scm, gnu/packages/monitoring.scm, gnu/packages/mp3.scm, gnu/packages/music.scm, gnu/packages/netpbm.scm, gnu/packages/networking.scm, gnu/packages/node.scm, gnu/packages/nvi.scm, gnu/packages/ocaml.scm, gnu/packages/pdf.scm, gnu/packages/perl.scm, gnu/packages/php.scm, gnu/packages/plotutils.scm, gnu/packages/pretty-print.scm, gnu/packages/profiling.scm, gnu/packages/pulseaudio.scm, gnu/packages/python-crypto.scm, gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/robotics.scm, gnu/packages/sawfish.scm, gnu/packages/scanner.scm, gnu/packages/scheme.scm, gnu/packages/scribus.scm, gnu/packages/sdl.scm, gnu/packages/serialization.scm, gnu/packages/shells.scm, gnu/packages/slang.scm, gnu/packages/smalltalk.scm, gnu/packages/ssh.scm, gnu/packages/sync.scm, gnu/packages/syncthing.scm, gnu/packages/tbb.scm, gnu/packages/terminals.scm, gnu/packages/texinfo.scm, gnu/packages/text-editors.scm, gnu/packages/textutils.scm, gnu/packages/tls.scm, gnu/packages/unrtf.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/vpn.scm, gnu/packages/web.scm, gnu/packages/wm.scm, gnu/packages/wxwidgets.scm, gnu/packages/xdisorg.scm, gnu/packages/xorg.scm: In all snippets, report errors using exceptions, or else return #t. --- gnu/packages/gl.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 0e416a9efd..b1b60d0040 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -478,9 +478,11 @@ (define-public glew "0r37fg2s1f0jrvwh6c8cz5x6v4wqmhq42qm15cs9qs349q5c6wn5")) (modules '((guix build utils))) (snippet - '(substitute* "config/Makefile.linux" - (("= cc") "= gcc") - (("/lib64") "/lib"))))) + '(begin + (substitute* "config/Makefile.linux" + (("= cc") "= gcc") + (("/lib64") "/lib")) + #t)))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit v1.2.3 From 82b4d9ec8c49ecffa77184c30fe0fbe935bd3c27 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 13:20:38 +0100 Subject: gnu: Switch from inputproto to xorgproto. * gnu/packages/gl.scm (freeglut)[inputs]: Replace INPUTPROTO with XORGPROTO. * gnu/packages/ratpoison.scm (ratpoison)[inputs]: Remove INPUTPROTO. * gnu/packages/xdisorg.scm (xautomation)[native-inputs]: Likewise. * gnu/packages/xnee.scm (xnee)[inputs]: Likewise. * gnu/packages/xorg.scm (inputproto)[properties]: Mark as superseded by XORGPROTO. (xdpyinfo, xinput, libxtst)[inputs]: Replace INPUTPROTO with XORGPROTO. (libxi, xorg-server)[propagated-inputs]: Remove INPUTPROTO. (xkbutils, libx11)[inputs]: Likewise. --- gnu/packages/gl.scm | 2 +- gnu/packages/ratpoison.scm | 3 +-- gnu/packages/xdisorg.scm | 3 +-- gnu/packages/xnee.scm | 1 - gnu/packages/xorg.scm | 21 ++++++++------------- 5 files changed, 11 insertions(+), 19 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index b1b60d0040..27d064346e 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -105,7 +105,7 @@ (define-public freeglut ("libxi" ,libxi) ("libxrandr" ,libxrandr) ("libxxf86vm" ,libxxf86vm) - ("inputproto" ,inputproto) + ("xorgproto" ,xorgproto) ("xinput" ,xinput))) (propagated-inputs ;; Headers from Mesa and GLU are needed. diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm index 4c83d0f67c..b1f012eb79 100644 --- a/gnu/packages/ratpoison.scm +++ b/gnu/packages/ratpoison.scm @@ -66,8 +66,7 @@ (define-public ratpoison (copy-file (assoc-ref inputs rpd) (string-append dst rpd)))))))) (inputs - `(("inputproto" ,inputproto) - ("fontconfig" ,fontconfig) + `(("fontconfig" ,fontconfig) ("freetype" ,freetype) ("libXft" ,libxft) ("libXi" ,libxi) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index deee636764..ceee6fa832 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -624,8 +624,7 @@ (define-public xautomation ("libxi" ,libxi) ("libxtst" ,libxtst))) (native-inputs - `(("inputproto" ,inputproto) - ("xorgproto" ,xorgproto))) + `(("xorgproto" ,xorgproto))) (synopsis "Tools to automate tasks in X such as detecting on screen images") (description "Xautomation can control X from the command line for scripts, and diff --git a/gnu/packages/xnee.scm b/gnu/packages/xnee.scm index 207a11c63d..025dc2185d 100644 --- a/gnu/packages/xnee.scm +++ b/gnu/packages/xnee.scm @@ -40,7 +40,6 @@ (define-public xnee (build-system gnu-build-system) (inputs `(("gtk+" ,gtk+-2) - ("inputproto" ,inputproto) ("libx11" ,libx11) ("libxext" ,libxext) ("libxi" ,libxi) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 82817f7a59..6ca60226f2 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -988,8 +988,8 @@ (define-public inputproto (description "Input Extension defines a protocol to provide additional input devices management such as graphic tablets.") - (license license:x11))) - + (license license:x11) + (properties `((superseded . ,xorgproto))))) (define-public kbproto (package @@ -2271,7 +2271,7 @@ (define-public xdpyinfo "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh")))) (build-system gnu-build-system) (inputs - `(("inputproto" ,inputproto) + `(("xorgproto" ,xorgproto) ("libx11" ,libx11) ("libxxf86vm" ,libxxf86vm) ("libxxf86dga" ,libxxf86dga) @@ -3707,7 +3707,7 @@ (define-public xinput ("libxext" ,libxext) ("libxi" ,libxi) ("libx11" ,libx11) - ("inputproto" ,inputproto))) + ("xorgproto" ,xorgproto))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") @@ -3812,9 +3812,8 @@ (define-public xkbutils (build-system gnu-build-system) (inputs `(("libxt" ,libxt) - ("xorgproto" ,xorgproto) ("libxaw" ,libxaw) - ("inputproto" ,inputproto))) + ("xorgproto" ,xorgproto))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") @@ -4667,7 +4666,7 @@ (define-public libxtst ("libxi" ,libxi))) (inputs `(("libx11" ,libx11) - ("inputproto" ,inputproto))) + ("xorgproto" ,xorgproto))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") @@ -4927,12 +4926,10 @@ (define-public libxi "0idg1wc01hndvaa820fvfs7phvd1ymf0lldmq6386i7rhkzvirn2")))) (build-system gnu-build-system) (propagated-inputs - `(("inputproto" ,inputproto) + `(("xorgproto" ,xorgproto) ("libx11" ,libx11) ("libxext" ,libxext) ("libxfixes" ,libxfixes))) - (inputs - `(("xorgproto" ,xorgproto))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") @@ -5105,7 +5102,6 @@ (define-public xorg-server `(("dri2proto" ,dri2proto) ("dri3proto" ,dri3proto) ("fontsproto" ,fontsproto) - ("inputproto" ,inputproto) ("libpciaccess" ,libpciaccess) ("mesa" ,mesa) ("pixman" ,pixman) @@ -5284,8 +5280,7 @@ (define-public libx11 `(("xorgproto" ,xorgproto) ("libxcb" ,libxcb))) (inputs - `(("inputproto" ,inputproto) - ("xtrans" ,xtrans))) + `(("xtrans" ,xtrans))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.x.org/wiki/") -- cgit v1.2.3 From 70b02a6a6a329c6a6f95be4e0af3ebdb0dfb726c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 13:47:49 +0100 Subject: gnu: Switch from glproto to xorgproto. * gnu/packages/gl.scm (mesa)[propaged-inputs]: Replace GLPROTO with XORGPROTO. * gnu/packages/xorg.scm (glproto)[properties]: Mark as superseded by XORGPROTO. --- gnu/packages/gl.scm | 6 +++--- gnu/packages/xorg.scm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 27d064346e..8494b48603 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -240,15 +240,15 @@ (define-public mesa "mesa-skip-disk-cache-test.patch")))) (build-system gnu-build-system) (propagated-inputs - `(("glproto" ,glproto) - ;; The following are in the Requires.private field of gl.pc. + `(;; The following are in the Requires.private field of gl.pc. ("libdrm" ,libdrm) ("libvdpau" ,libvdpau) ("libx11" ,libx11) ("libxdamage" ,libxdamage) ("libxfixes" ,libxfixes) ("libxshmfence" ,libxshmfence) - ("libxxf86vm" ,libxxf86vm))) + ("libxxf86vm" ,libxxf86vm) + ("xorgproto" ,xorgproto))) (inputs `(("expat" ,expat) ("dri2proto" ,dri2proto) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index cf062fd253..fade6e8fea 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -935,8 +935,8 @@ (define-public glproto (description "OpenGL Extension defines a protocol for the client to send 3D rendering commands to the X server.") - (license license:x11))) - + (license license:x11) + (properties `((superseded . ,xorgproto))))) (define-public iceauth (package -- cgit v1.2.3 From 3993a28a36593187dde94c88b55d75ce12175fa7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 13:55:07 +0100 Subject: gnu: Switch from dri2proto to xorgproto. * gnu/packages/gl.scm (mesa)[inputs]: Remove DRI2PROTO. * gnu/packages/video.scm (libvdpau)[inputs]: Replace DRI2PROTO with XORGPROTO. * gnu/packages/xorg.scm (dri2proto)[properties]: Mark as superseded by XORGPROTO. (xorg-server)[inputs]: Remove DRI2PROTO. --- gnu/packages/gl.scm | 1 - gnu/packages/video.scm | 6 +++--- gnu/packages/xorg.scm | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 8494b48603..920cc92655 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -251,7 +251,6 @@ (define-public mesa ("xorgproto" ,xorgproto))) (inputs `(("expat" ,expat) - ("dri2proto" ,dri2proto) ("dri3proto" ,dri3proto) ("libelf" ,libelf) ;required for r600 when using llvm ("libva" ,(force libva-without-mesa)) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ffc5f33e7b..15e1e2caeb 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1936,9 +1936,9 @@ (define-public libvdpau (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("dri2proto" ,dri2proto) - ("libx11" ,libx11 "out") - ("libxext" ,libxext))) + `(("libx11" ,libx11 "out") + ("libxext" ,libxext) + ("xorgproto" ,xorgproto))) (home-page "https://wiki.freedesktop.org/www/Software/VDPAU/") (synopsis "Video Decode and Presentation API") (description "VDPAU is the Video Decode and Presentation API for UNIX. It diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index d895f56387..4df95a1fb4 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -346,7 +346,8 @@ (define-public dri2proto "Direct Rendering Infrastructure 2 Extension defines a protocol to securely allow user applications to access the video hardware without requiring data to be passed through the X server.") - (license license:x11))) + (license license:x11) + (properties `((superseded . ,xorgproto))))) (define-public dri3proto (package @@ -5094,8 +5095,7 @@ (define-public xorg-server (file-name "xorg-server-use-intel-only-on-pre-gen4.diff")))))) (build-system gnu-build-system) (propagated-inputs - `(("dri2proto" ,dri2proto) - ("dri3proto" ,dri3proto) + `(("dri3proto" ,dri3proto) ("libpciaccess" ,libpciaccess) ("mesa" ,mesa) ("pixman" ,pixman) -- cgit v1.2.3 From 0e540ac1e204ccdb0f57958ea894b012f9bdcfb9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 13:57:03 +0100 Subject: gnu: Switch from dri3proto to xorgproto. * gnu/packages/gl.scm (mesa)[inputs]: Remove DRI3PROTO. * gnu/packages/xorg.scm (xorg-server)[propagated-inputs]: Likewise. (dri3proto)[properties]: Mark as superseded by XORGPROTO. --- gnu/packages/gl.scm | 1 - gnu/packages/xorg.scm | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 920cc92655..daec4b52bc 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -251,7 +251,6 @@ (define-public mesa ("xorgproto" ,xorgproto))) (inputs `(("expat" ,expat) - ("dri3proto" ,dri3proto) ("libelf" ,libelf) ;required for r600 when using llvm ("libva" ,(force libva-without-mesa)) ("libxml2" ,libxml2) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 4df95a1fb4..e412a949d9 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -372,7 +372,8 @@ (define-public dri3proto the Present extension, a complete direct rendering solution for OpenGL is provided.") (license (license:x11-style "file://dri3proto.h" - "See 'dri3proto.h' in the distribution.")))) + "See 'dri3proto.h' in the distribution.")) + (properties `((superseded . ,xorgproto))))) (define-public %app-defaults-dir "/lib/X11/app-defaults") @@ -5095,8 +5096,7 @@ (define-public xorg-server (file-name "xorg-server-use-intel-only-on-pre-gen4.diff")))))) (build-system gnu-build-system) (propagated-inputs - `(("dri3proto" ,dri3proto) - ("libpciaccess" ,libpciaccess) + `(("libpciaccess" ,libpciaccess) ("mesa" ,mesa) ("pixman" ,pixman) ("presentproto" ,presentproto) -- cgit v1.2.3 From 314144d2128f99e05312b6622734f645a6f5cac4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Mar 2018 14:06:12 +0100 Subject: gnu: Switch from presentproto to xorgproto. * gnu/packages/gl.scm (mesa)[inputs]: Remove PRESENTPROTO. * gnu/packages/xorg.scm (xorg-server)[inputs]: Likewise. (presentproto)[properties]: Mark as superseded by XORGPROTO. --- gnu/packages/gl.scm | 1 - gnu/packages/xorg.scm | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index daec4b52bc..74875738e6 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -262,7 +262,6 @@ (define-public mesa (_ `())) ("makedepend" ,makedepend) - ("presentproto" ,presentproto) ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols))) (native-inputs diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 825a40d439..4d62c8896a 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1629,7 +1629,8 @@ (define-public presentproto with the display refresh and potentially using a more efficient mechanism than copying the contents of the source pixmap.") (license (license:x11-style "file://presentproto.h" - "See 'presentproto.h' in the distribution.")))) + "See 'presentproto.h' in the distribution.")) + (properties `((superseded . ,xorgproto))))) (define-public printproto (package @@ -5097,7 +5098,6 @@ (define-public xorg-server `(("libpciaccess" ,libpciaccess) ("mesa" ,mesa) ("pixman" ,pixman) - ("presentproto" ,presentproto) ("renderproto" ,renderproto) ("resourceproto" ,resourceproto) ("scrnsaverproto" ,scrnsaverproto) -- cgit v1.2.3 From 51b491b049b921fbfee0b06fbdd61cf2137dc926 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 23 Mar 2018 03:11:15 -0400 Subject: gnu: mesa-headers: Return #t from all phases. * gnu/packages/gl.scm (mesa-headers)[arguments]: Return #t from the custom install phase. --- gnu/packages/gl.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 9930de87de..e01e46cdd1 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -413,10 +413,11 @@ (define-public mesa-headers (delete 'build) (delete 'check) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (copy-recursively "include" (string-append - (assoc-ref outputs "out") - "/include"))))))))) + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively "include" (string-append + (assoc-ref outputs "out") + "/include")) + #t))))))) ;;; The mesa-demos distribution contains non-free files, many files with no ;;; clear license information, and many demos that aren't useful for most -- cgit v1.2.3 From feb0804376a116b90e559e30a36ccba2ed5f69f1 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 23 Mar 2018 03:12:07 -0400 Subject: gnu: mesa-utils: Return #t from all phases. * gnu/packages/gl.scm (mesa-utils)[arguments]: Return #t from the custom install phase. --- gnu/packages/gl.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index e01e46cdd1..35db95b4f0 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -454,7 +454,8 @@ (define-public mesa-utils (lambda (file) (copy-file file (string-append out "/bin/" (basename file)))) '("src/xdemos/glxdemo" "src/xdemos/glxgears" - "src/xdemos/glxinfo" "src/xdemos/glxheads")))))))) + "src/xdemos/glxinfo" "src/xdemos/glxheads")) + #t)))))) (home-page "http://mesa3d.org/") (synopsis "Utility tools for Mesa") (description -- cgit v1.2.3 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/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 @@ (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 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 @@ (define-module (gnu packages gl) #: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