summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-03-10 14:46:31 +0100
committerMarius Bakke <mbakke@fastmail.com>2018-03-18 00:19:57 +0100
commit5b6f1be7833661fc359d51a7b0a82ae8f48348e5 (patch)
tree2106bf0883c83614180e1171b47826526fe13e0e /gnu
parentd7f37691953d8d44e8ef42ac41fefee989341cc6 (diff)
downloadguix-patches-5b6f1be7833661fc359d51a7b0a82ae8f48348e5.tar
guix-patches-5b6f1be7833661fc359d51a7b0a82ae8f48348e5.tar.gz
gnu: Switch from xf86vidmodeproto to xorgproto.
* gnu/packages/xorg.scm (xf86vidmodeproto)[properties]: Mark as superseded by XORGPROTO. (libxxf86vm)[propagated-inputs]: Replace XF86VIDMODEPROTO with XORGPROTO. (xorg-server)[inputs]: Remove XF86VIDMODEPROTO.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/xorg.scm7
1 files changed, 3 insertions, 4 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index aa8c19b06e..83cb891823 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3591,8 +3591,8 @@ requiring data to be passed through the X server.")
(description
"XFree86 Video Mode Extension defines a protocol for dynamically
configuring modelines and gamma.")
- (license license:x11)))
-
+ (license license:x11)
+ (properties `((superseded . ,xorgproto)))))
(define-public xgamma
(package
@@ -5002,7 +5002,7 @@ new API's in libXft, or the legacy API's in libX11.")
(build-system gnu-build-system)
(propagated-inputs
`(("libxext" ,libxext)
- ("xf86vidmodeproto" ,xf86vidmodeproto)))
+ ("xorgproto" ,xorgproto)))
(inputs
`(("libx11" ,libx11)))
(native-inputs
@@ -5112,7 +5112,6 @@ over Xlib, including:
("libxshmfence" ,libxshmfence)
("libxt" ,libxt)
("libxv" ,libxv)
- ("xf86vidmodeproto" ,xf86vidmodeproto)
("xkbcomp" ,xkbcomp)
("xkeyboard-config" ,xkeyboard-config)
("xtrans" ,xtrans)