aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/xorg.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-03-10 14:15:06 +0100
committerMarius Bakke <mbakke@fastmail.com>2018-03-18 00:19:56 +0100
commit2bf1fa98f2d24bbc3fd6aa04a8451c7f2762ca9e (patch)
tree7fb26e73baba5a6af58fcb18c8b9200349c00354 /gnu/packages/xorg.scm
parentf579a1d2fa21d59cfbc71643094f098e8cf47190 (diff)
downloadpatches-2bf1fa98f2d24bbc3fd6aa04a8451c7f2762ca9e.tar
patches-2bf1fa98f2d24bbc3fd6aa04a8451c7f2762ca9e.tar.gz
gnu: Switch from resourceproto to xorgproto.
* gnu/packages/xorg.scm (libxres)[inputs]: Remove RESOURCEPROTO. (resourceproto)[properties]: Mark as superseded by XORGPROTO. (xorg-server)[propagated-inputs]: Remove RESOURCEPROTO.
Diffstat (limited to 'gnu/packages/xorg.scm')
-rw-r--r--gnu/packages/xorg.scm8
1 files changed, 3 insertions, 5 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 17f22b9197..a1af127f72 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1453,8 +1453,7 @@ treat it as part of their software base when porting.")
(inputs
`(("xorgproto" ,xorgproto)
("libxext" ,libxext)
- ("libx11" ,libx11)
- ("resourceproto" ,resourceproto)))
+ ("libx11" ,libx11)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://www.x.org/wiki/")
@@ -1751,8 +1750,8 @@ as the foundation of a new rendering model within the X Window System.")
(description
"Resource Extension defines a protocol that allows a client to
query the X server about its usage of various resources.")
- (license license:x11)))
-
+ (license license:x11)
+ (properties `((superseded . ,xorgproto)))))
(define-public scrnsaverproto
(package
@@ -5097,7 +5096,6 @@ over Xlib, including:
`(("libpciaccess" ,libpciaccess)
("mesa" ,mesa)
("pixman" ,pixman)
- ("resourceproto" ,resourceproto)
("scrnsaverproto" ,scrnsaverproto)
("xineramaproto" ,xineramaproto)
("xf86driproto" ,xf86driproto)