diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-03-10 13:47:49 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-03-18 00:19:55 +0100 |
| commit | 70b02a6a6a329c6a6f95be4e0af3ebdb0dfb726c (patch) | |
| tree | 154f14a04735e6bc1d75a445d4cdb85a3c4aa7d2 /gnu | |
| parent | b4d7aef53658388316dd9727bca6cb9afad734e2 (diff) | |
| download | guix-70b02a6a6a329c6a6f95be4e0af3ebdb0dfb726c.tar.gz guix-70b02a6a6a329c6a6f95be4e0af3ebdb0dfb726c.zip | |
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.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/gl.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/xorg.scm | 4 |
2 files changed, 5 insertions, 5 deletions
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 @@ also known as DXTn or DXTC) for 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 @@ the fonts protocol.") (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 |