diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-03-10 14:06:12 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-03-18 00:19:56 +0100 |
commit | 314144d2128f99e05312b6622734f645a6f5cac4 (patch) | |
tree | b22d2810de3bce5e78ca9fcebd777b8db29f5b30 | |
parent | b9469160c0cda197089a81d99599ae28a061f717 (diff) | |
download | gnu-guix-314144d2128f99e05312b6622734f645a6f5cac4.tar gnu-guix-314144d2128f99e05312b6622734f645a6f5cac4.tar.gz |
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.
-rw-r--r-- | gnu/packages/gl.scm | 1 | ||||
-rw-r--r-- | gnu/packages/xorg.scm | 4 |
2 files changed, 2 insertions, 3 deletions
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 @@ also known as DXTn or DXTC) for 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 @@ window contents from a pixmap in a well defined fashion, synchronizing 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 @@ over Xlib, including: `(("libpciaccess" ,libpciaccess) ("mesa" ,mesa) ("pixman" ,pixman) - ("presentproto" ,presentproto) ("renderproto" ,renderproto) ("resourceproto" ,resourceproto) ("scrnsaverproto" ,scrnsaverproto) |