~ruther/guix-local

6eb126c5f2870209837919b93b899857046497b5 — Andreas Enge 13 years ago 48ebc13 
gnu: xorg: Add inputs and propagated-inputs, propagate some inputs.
           Rename two packages to avoid clashes between package names and versions.

* gnu/packages/xorg.scm (font-adobe-100dpi): Rename to font-adobe100dpi.
* gnu/packages/xorg.scm (font-adobe-75dpi): Rename to font-adobe75dpi.
* gnu/packages/xorg.scm: Add pkg-xonfig as input to several packages.
* gnu/packages/xorg.scm (encodings): Add input mkfontscale.
* gnu/packages/xorg.scm (libx11): Add inputs inputprotoi, xextproto, xtrans.
* gnu/packages/xorg.scm (libxpm): Add input gettext.
* gnu/packages/xorg.scm (libxxf86dga): Add inputs libx11, libxext, xf86dgaproto.
* gnu/packages/xorg.scm (libxxf86vm): Add inputs libx11i, libxext, xf86vidmodeproto.
* gnu/packages/xorg.scm (x11perf): Add inputs libx11i, libxfti, libxmu, libxrender.
* gnu/packages/xorg.scm (xcursor-themes): Add input xcursorgen.
* gnu/packages/xorg.scm (xdpyinfo): Add input inputproto.
* gnu/packages/xorg.scm (font-xfree86-type1): Add input mkfontdir.
* gnu/packages/xorg.scm (libx11): Add propagated inputs kbproto, libxcb.
* gnu/packages/xorg.scm (mkfontdir): Add propagated input mkfontscale.
* gnu/packages/xorg.scm (fixesproto): Propagate input xextproto.
* gnu/packages/xorg.scm (libice): Propagate input xproto.
* gnu/packages/xorg.scm (libxau): Propagate input xproto.
* gnu/packages/xorg.scm (libxaw): Propagate inputs libxext, libxmu, libxpm.
* gnu/packages/xorg.scm (libxcb): Propagate inputs libpthread-stubs, libxaui, libxdmcp.
* gnu/packages/xorg.scm (libxcursor): Propagate inputs libx11, libxfixes, libxrender, xproto.
* gnu/packages/xorg.scm (libxext): Propagate input xextproto.
* gnu/packages/xorg.scm (libxfixes): Propagate input fixesproto.
* gnu/packages/xorg.scm (libxfont): Propagate inputs fontsproto, freetype, libfontenc, xproto.
* gnu/packages/xorg.scm (libxinerama): Propagate input xineramaproto.
* gnu/packages/xorg.scm (libxrandr): Propagate inputs libxext, randrproto.
* gnu/packages/xorg.scm (libxrender): Propagate input renderproto.
* gnu/packages/xorg.scm (libxt): Propagate inputs libx11, libice, libsm.
* gnu/packages/xorg.scm (libxtst): Propagate input recordproto.
* gnu/packages/xorg.scm (xbacklight): Propagate inputs libx11, libxrandr.
* gnu/packages/xorg.scm (xkeyboard-config): Propagate inputs libx11, xkbcomp.
* gnu/packages/xorg.scm (xproto): Propagate input util-macros.
patch browse .tar.gz 
1 files changed, 1139 insertions(+), 1018 deletions(-)

M gnu/packages/xorg.scm

M gnu/packages/xorg.scm => gnu/packages/xorg.scm +1139 -1018
@@ 27,6 27,8 @@
  #:use-module (gnu packages bison)
  #:use-module (gnu packages flex)
  #:use-module (gnu packages fontutils)
  #:use-module ((gnu packages gettext)
                #:renamer (symbol-prefix-proc 'gnu:))
  #:use-module (gnu packages glib)
  #:use-module (gnu packages gperf)
  #:use-module (gnu packages libpng)


@@ 38,6 40,13 @@
  #:use-module (gnu packages python)
  #:use-module (gnu packages xml))



;; packages without propagated input
;; (rationale for this separation: The packages in PROPAGATED_INPUTS need to
;; be defined first, the split makes book-keeping easier.)


(define-public applewmproto
  (package
    (name "applewmproto")


@@ 210,40 219,18 @@
          (base32
            "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:public-domain)))


(define-public fixesproto
  (package
    (name "fixesproto")
    (version "5.0")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/fixesproto-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs"))))
    (build-system gnu-build-system)
    (inputs
      `(("xextproto" ,xextproto)
      `(("mkfontscale" ,mkfontscale)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))
    (license license:public-domain)))


(define-public font-adobe-100dpi
(define-public font-adobe100dpi
  (package
    (name "font-adobe-100dpi")
    (name "font-adobe100dpi")
    (version "1.0.3")
    (source
      (origin


@@ 262,9 249,9 @@
    (license license:x11)))


(define-public font-adobe-75dpi
(define-public font-adobe75dpi
  (package
    (name "font-adobe-75dpi")
    (name "font-adobe75dpi")
    (version "1.0.3")
    (source
      (origin


@@ 283,9 270,9 @@
    (license license:x11)))


;; (define-public font-adobe-utopia-100dpi
;; (define-public font-adobe-utopia100dpi
;;   (package
;;     (name "font-adobe-utopia-100dpi")
;;     (name "font-adobe-utopia100dpi")
;;     (version "1.0.4")
;;     (source
;;       (origin


@@ 304,9 291,9 @@
;;     (license non-free)))
;; 
;; 
;; (define-public font-adobe-utopia-75dpi
;; (define-public font-adobe-utopia75dpi
;;   (package
;;     (name "font-adobe-utopia-75dpi")
;;     (name "font-adobe-utopia75dpi")
;;     (version "1.0.4")
;;     (source
;;       (origin


@@ 393,9 380,9 @@
    (license license:x11)))


;; (define-public font-bh-100dpi
;; (define-public font-bh100dpi
;;   (package
;;     (name "font-bh-100dpi")
;;     (name "font-bh100dpi")
;;     (version "1.0.3")
;;     (source
;;       (origin


@@ 414,9 401,9 @@
;;     (license non-free)))
;; 
;; 
;; (define-public font-bh-75dpi
;; (define-public font-bh75dpi
;;   (package
;;     (name "font-bh-75dpi")
;;     (name "font-bh75dpi")
;;     (version "1.0.3")
;;     (source
;;       (origin


@@ 435,9 422,9 @@
;;     (license non-free)))
;; 
;; 
;; (define-public font-bh-lucidatypewriter-100dpi
;; (define-public font-bh-lucidatypewriter100dpi
;;   (package
;;     (name "font-bh-lucidatypewriter-100dpi")
;;     (name "font-bh-lucidatypewriter100dpi")
;;     (version "1.0.3")
;;     (source
;;       (origin


@@ 456,9 443,9 @@
;;     (license non-free)))
;; 
;; 
;; (define-public font-bh-lucidatypewriter-75dpi
;; (define-public font-bh-lucidatypewriter75dpi
;;   (package
;;     (name "font-bh-lucidatypewriter-75dpi")
;;     (name "font-bh-lucidatypewriter75dpi")
;;     (version "1.0.3")
;;     (source
;;       (origin


@@ 502,9 489,9 @@
;;     (license non-free)))
;;
;;
;; (define-public font-bitstream-100dpi
;; (define-public font-bitstream100dpi
;;   (package
;;     (name "font-bitstream-100dpi")
;;     (name "font-bitstream100dpi")
;;     (version "1.0.3")
;;     (source
;;       (origin


@@ 527,9 514,9 @@
;;     (license non-free)))
;;
;;
;; (define-public font-bitstream-75dpi
;; (define-public font-bitstream75dpi
;;   (package
;;     (name "font-bitstream-75dpi")
;;     (name "font-bitstream75dpi")
;;     (version "1.0.3")
;;     (source
;;       (origin


@@ 1069,6 1056,9 @@
          (base32
            "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"))))
    (build-system gnu-build-system)
    (inputs
      `(("mkfontdir" ,mkfontdir)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")


@@ 1293,31 1283,6 @@
    (license license:x11)))


(define-public libice
  (package
    (name "libice")
    (version "1.0.8")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libICE-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "07mp13pb3s73kj7y490gnx619znzwk91mlf8kdw0rzq29ll93a94"))))
    (build-system gnu-build-system)
    (inputs
      `(("xtrans" ,xtrans)
        ("xproto" ,xproto)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public libpciaccess
  (package
    (name "libpciaccess")


@@ 1417,130 1382,137 @@
    (license license:x11)))


(define-public libx11
(define-public libxcomposite
  (package
    (name "libx11")
    (version "1.5.0")
    (name "libxcomposite")
    (version "0.4.3")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libX11-"
               "mirror://xorg/X11R7.7/src/everything/libXcomposite-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "11jdpl15bxwpwv0knpkh990s8jvlybng3dx477pkrz1bx7byz0n3"))))
            "1b8sniijb85v4my6v30ma9yqnwl4hkclci9l1hqxnipfyhl4sa9j"))))
    (build-system gnu-build-system)
    (inputs
      `(("xproto" ,xproto)
        ("libxfixes" ,libxfixes)
        ("libx11" ,libx11)
        ("compositeproto" ,compositeproto)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public libxau
(define-public libxdamage
  (package
    (name "libxau")
    (version "1.0.7")
    (name "libxdamage")
    (version "1.1.3")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXau-"
               "mirror://xorg/X11R7.7/src/everything/libXdamage-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "12d4f7sdv2pjxhk0lcay0pahccddszkw579dc59daqi37r8bllvi"))))
            "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw"))))
    (build-system gnu-build-system)
    (inputs
      `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
      `(("xproto" ,xproto)
        ("libxfixes" ,libxfixes)
        ("xextproto" ,xextproto)
        ("libx11" ,libx11)
        ("fixesproto" ,fixesproto)
        ("damageproto" ,damageproto)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public libxaw
(define-public libxdmcp
  (package
    (name "libxaw")
    (version "1.0.11")
    (name "libxdmcp")
    (version "1.1.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXaw-"
               "mirror://xorg/X11R7.7/src/everything/libXdmcp-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "14ll7ndf5njc30hz2w197qvwp7fqj7y14wq4p1cyxlbipfn79a47"))))
            "13highx4xpgkiwykpcl7z2laslrjc4pzi4h617ny9p7r6116vkls"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxt" ,libxt)
        ("xproto" ,xproto)
        ("libxpm" ,libxpm)
        ("libxmu" ,libxmu)
        ("xextproto" ,xextproto)
        ("libxext" ,libxext)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
      `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public libxcb
(define-public libxft
  (package
    (name "libxcb")
    (version "1.8.1")
    (name "libxft")
    (version "2.3.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libxcb-"
               "mirror://xorg/X11R7.7/src/everything/libXft-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "03gspxcdl8r7jwbwg7fyp4cc6zic9z91amp4g5z0wwahx48nix6j"))))
            "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz"))))
    (build-system gnu-build-system)
    (inputs
      `(("xproto" ,xproto)
        ("libxdmcp" ,libxdmcp)
        ("xcb-proto" ,xcb-proto)
        ("libxau" ,libxau)
        ("libpthread-stubs" ,libpthread-stubs)
        ("libxslt" ,libxslt)
        ("pkg-config" ,pkg-config)
        ("python" ,python)))
      `(("renderproto" ,renderproto)
        ("libx11" ,libx11)
        ("xproto" ,xproto)
        ("libxrender" ,libxrender)
        ("xproto" ,xproto)
        ("libx11" ,libx11)
        ("freetype" ,freetype)
        ("fontconfig" ,fontconfig)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public libxcomposite
(define-public libxi
  (package
    (name "libxcomposite")
    (version "0.4.3")
    (name "libxi")
    (version "1.6.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXcomposite-"
               "mirror://xorg/X11R7.7/src/everything/libXi-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1b8sniijb85v4my6v30ma9yqnwl4hkclci9l1hqxnipfyhl4sa9j"))))
            "029ihw4jq8mng8rx7a3jdvq64jm1zdkqidca93zmxv4jf9yn5qzj"))))
    (build-system gnu-build-system)
    (inputs
      `(("xproto" ,xproto)
        ("libxfixes" ,libxfixes)
        ("xextproto" ,xextproto)
        ("libxext" ,libxext)
        ("libx11" ,libx11)
        ("compositeproto" ,compositeproto)
        ("inputproto" ,inputproto)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 1548,27 1520,24 @@
    (license license:x11)))


(define-public libxcursor
(define-public libxkbfile
  (package
    (name "libxcursor")
    (version "1.1.13")
    (name "libxkbfile")
    (version "1.0.8")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXcursor-"
               "mirror://xorg/X11R7.7/src/everything/libxkbfile-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "13xd1dyb06gwdwb0bxb22fkgdlmis6wrljm2xk6fhz0v9bg2g27p"))))
            "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxrender" ,libxrender)
        ("xproto" ,xproto)
        ("libxfixes" ,libxfixes)
        ("libx11" ,libx11)
        ("fixesproto" ,fixesproto)
      `(("libx11" ,libx11)
        ("kbproto" ,kbproto)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 1576,28 1545,27 @@
    (license license:x11)))


(define-public libxdamage
(define-public libxmu
  (package
    (name "libxdamage")
    (version "1.1.3")
    (name "libxmu")
    (version "1.1.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXdamage-"
               "mirror://xorg/X11R7.7/src/everything/libXmu-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw"))))
            "1pbym8rrznxqd60zwf7w4xpf27sa72bky2knginqcfnca32q343h"))))
    (build-system gnu-build-system)
    (inputs
      `(("xproto" ,xproto)
        ("libxfixes" ,libxfixes)
      `(("libxt" ,libxt)
        ("xproto" ,xproto)
        ("xextproto" ,xextproto)
        ("libxext" ,libxext)
        ("libx11" ,libx11)
        ("fixesproto" ,fixesproto)
        ("damageproto" ,damageproto)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 1605,49 1573,56 @@
    (license license:x11)))


(define-public libxdmcp
(define-public libxpm
  (package
    (name "libxdmcp")
    (version "1.1.1")
    (name "libxpm")
    (version "3.5.10")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXdmcp-"
               "mirror://xorg/X11R7.7/src/everything/libXpm-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "13highx4xpgkiwykpcl7z2laslrjc4pzi4h617ny9p7r6116vkls"))))
            "0dd737ch4q9gr151wff1m3q2j7wf3pip4y81601xdrsh8wipxnx6"))))
    (build-system gnu-build-system)
    (inputs
      `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
      `(("gettext" ,gnu:gettext)
        ("libxt" ,libxt)
        ("xproto" ,xproto)
        ("xextproto" ,xextproto)
        ("libxext" ,libxext)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public libxext
(define-public libxres
  (package
    (name "libxext")
    (version "1.3.1")
    (name "libxres")
    (version "1.0.6")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXext-"
               "mirror://xorg/X11R7.7/src/everything/libXres-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0ng8clhn7srbkadxjc7ih3z3v27v9ny0aa0dqkgddgxpgrhrq8jn"))))
            "1478pm70gdi6l70r4jpkyyg2am9wv6xh53z9ibwq5cg84p4n31pz"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxau" ,libxau)
        ("xproto" ,xproto)
      `(("xproto" ,xproto)
        ("xextproto" ,xextproto)
        ("libxext" ,libxext)
        ("libx11" ,libx11)
        ("resourceproto" ,resourceproto)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 1655,26 1630,26 @@
    (license license:x11)))


(define-public libxfixes
(define-public libxscrnsaver
  (package
    (name "libxfixes")
    (version "5.0")
    (name "libxscrnsaver")
    (version "1.2.2")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXfixes-"
               "mirror://xorg/X11R7.7/src/everything/libXScrnSaver-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1qx2rmwhmca2n7rgafy0arp15k5vwhdhhh6v6mx76hlj29328yjk"))))
            "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg"))))
    (build-system gnu-build-system)
    (inputs
      `(("xproto" ,xproto)
        ("xextproto" ,xextproto)
      `(("xextproto" ,xextproto)
        ("libxext" ,libxext)
        ("libx11" ,libx11)
        ("fixesproto" ,fixesproto)
        ("scrnsaverproto" ,scrnsaverproto)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 1682,28 1657,27 @@
    (license license:x11)))


(define-public libxfont
(define-public libxv
  (package
    (name "libxfont")
    (version "1.4.5")
    (name "libxv")
    (version "1.0.7")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXfont-"
               "mirror://xorg/X11R7.7/src/everything/libXv-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0w3irg00k6b6mziddnacln9q2rkf5848b04nvjqwv5bb1fw6zydv"))))
            "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx"))))
    (build-system gnu-build-system)
    (inputs
      `(("zlib" ,zlib)
        ("xtrans" ,xtrans)
        ("xproto" ,xproto)
        ("freetype" ,freetype)
        ("fontsproto" ,fontsproto)
        ("libfontenc" ,libfontenc)
      `(("xproto" ,xproto)
        ("xextproto" ,xextproto)
        ("libxext" ,libxext)
        ("libx11" ,libx11)
        ("videoproto" ,videoproto)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 1711,30 1685,28 @@
    (license license:x11)))


(define-public libxft
(define-public libxvmc
  (package
    (name "libxft")
    (version "2.3.1")
    (name "libxvmc")
    (version "1.0.7")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXft-"
               "mirror://xorg/X11R7.7/src/everything/libXvMC-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz"))))
            "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18"))))
    (build-system gnu-build-system)
    (inputs
      `(("renderproto" ,renderproto)
        ("libx11" ,libx11)
        ("xproto" ,xproto)
        ("libxrender" ,libxrender)
      `(("libxv" ,libxv)
        ("xproto" ,xproto)
        ("xextproto" ,xextproto)
        ("libxext" ,libxext)
        ("libx11" ,libx11)
        ("freetype" ,freetype)
        ("fontconfig" ,fontconfig)
        ("videoproto" ,videoproto)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 1742,79 1714,75 @@
    (license license:x11)))


(define-public libxi
(define-public libxxf86dga
  (package
    (name "libxi")
    (version "1.6.1")
    (name "libxxf86dga")
    (version "1.1.3")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXi-"
               "mirror://xorg/X11R7.7/src/everything/libXxf86dga-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "029ihw4jq8mng8rx7a3jdvq64jm1zdkqidca93zmxv4jf9yn5qzj"))))
            "15291ddhyr54sribwbg8hxx2psgzm5gh0pgkw5yrf3zgvdsa67sm"))))
    (build-system gnu-build-system)
    (inputs
      `(("xproto" ,xproto)
        ("xextproto" ,xextproto)
      `(("libx11" ,libx11)
        ("libxext" ,libxext)
        ("libx11" ,libx11)
        ("inputproto" ,inputproto)
        ("pkg-config" ,pkg-config)))
        ("pkg-config" ,pkg-config)
        ("xf86dgaproto" ,xf86dgaproto)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public libxinerama
(define-public libxxf86vm
  (package
    (name "libxinerama")
    (name "libxxf86vm")
    (version "1.1.2")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXinerama-"
               "mirror://xorg/X11R7.7/src/everything/libXxf86vm-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1b3aq1762hxzchd9ndavdjlksq93991s0g2z6spf8wl3v0pprrx4"))))
            "117w92xz39rcqcahspi48nc04cc9110x1dycpf3vbcb6p0pifr55"))))
    (build-system gnu-build-system)
    (inputs
      `(("xineramaproto" ,xineramaproto)
        ("xextproto" ,xextproto)
      `(("libx11" ,libx11)
        ("libxext" ,libxext)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
        ("pkg-config" ,pkg-config)
        ("xf86vidmodeproto" ,xf86vidmodeproto)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public libxkbfile
(define-public luit
  (package
    (name "libxkbfile")
    (version "1.0.8")
    (name "luit")
    (version "1.1.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libxkbfile-"
               "mirror://xorg/X11R7.7/src/everything/luit-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca"))))
            "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h"))))
    (build-system gnu-build-system)
    (inputs
      `(("libx11" ,libx11)
        ("kbproto" ,kbproto)
      `(("libfontenc" ,libfontenc)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 1822,55 1790,49 @@
    (license license:x11)))


(define-public libxmu
(define-public makedepend
  (package
    (name "libxmu")
    (version "1.1.1")
    (name "makedepend")
    (version "1.0.4")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXmu-"
               "mirror://xorg/X11R7.7/src/everything/makedepend-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1pbym8rrznxqd60zwf7w4xpf27sa72bky2knginqcfnca32q343h"))))
            "1zpp2b9dfvlnfj2i1mzdyn785rpl7vih5lap7kcpiv80xspbhmmb"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxt" ,libxt)
        ("xproto" ,xproto)
        ("xextproto" ,xextproto)
        ("libxext" ,libxext)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
      `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public libxpm
(define-public mkfontscale
  (package
    (name "libxpm")
    (version "3.5.10")
    (name "mkfontscale")
    (version "1.1.0")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXpm-"
               "mirror://xorg/X11R7.7/src/everything/mkfontscale-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0dd737ch4q9gr151wff1m3q2j7wf3pip4y81601xdrsh8wipxnx6"))))
            "1539h3ws66vcql6sf2831bcs0r4d9b05lcgpswkw33lvcxighmff"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxt" ,libxt)
      `(("zlib" ,zlib)
        ("xproto" ,xproto)
        ("xextproto" ,xextproto)
        ("libxext" ,libxext)
        ("libx11" ,libx11)
        ("freetype" ,freetype)
        ("libfontenc" ,libfontenc)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 1878,195 1840,157 @@
    (license license:x11)))


(define-public libxrandr
(define-public randrproto
  (package
    (name "libxrandr")
    (name "randrproto")
    (version "1.3.2")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/XqqR7.7/src/everything/libXrandr-"
               "mirror://xorg/X11R7.7/src/everything/randrproto-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "10cvv78ws8jznma4s45dzqz0ldcxk30qgsqrc4wxfcsjmcba5b3y"))))
            "0wfwcq85wbm0g5r0snc7prgki1wi3kxrxhcxinyr54n45ihh03fr"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxrender" ,libxrender)
        ("xproto" ,xproto)
        ("xextproto" ,xextproto)
        ("libxext" ,libxext)
        ("libx11" ,libx11)
        ("renderproto" ,renderproto)
        ("randrproto" ,randrproto)
        ("pkg-config" ,pkg-config)))
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public libxrender
(define-public recordproto
  (package
    (name "libxrender")
    (version "0.9.7")
    (name "recordproto")
    (version "1.14.2")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXrender-"
               "mirror://xorg/X11R7.7/src/everything/recordproto-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1rmvja2gkf5v0k2n1bcghw8v98m2kfn3af0rbmsda5dwr69npd7r"))))
            "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7"))))
    (build-system gnu-build-system)
    (inputs
      `(("xproto" ,xproto)
        ("libx11" ,libx11)
        ("renderproto" ,renderproto)
        ("pkg-config" ,pkg-config)))
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public libxres
(define-public renderproto
  (package
    (name "libxres")
    (version "1.0.6")
    (name "renderproto")
    (version "0.11.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXres-"
               "mirror://xorg/X11R7.7/src/everything/renderproto-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1478pm70gdi6l70r4jpkyyg2am9wv6xh53z9ibwq5cg84p4n31pz"))))
            "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6"))))
    (build-system gnu-build-system)
    (inputs
      `(("xproto" ,xproto)
        ("xextproto" ,xextproto)
        ("libxext" ,libxext)
        ("libx11" ,libx11)
        ("resourceproto" ,resourceproto)
        ("pkg-config" ,pkg-config)))
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public libxscrnsaver
(define-public resourceproto
  (package
    (name "libxscrnsaver")
    (version "1.2.2")
    (name "resourceproto")
    (version "1.2.0")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXScrnSaver-"
               "mirror://xorg/X11R7.7/src/everything/resourceproto-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg"))))
            "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw"))))
    (build-system gnu-build-system)
    (inputs
      `(("xextproto" ,xextproto)
        ("libxext" ,libxext)
        ("libx11" ,libx11)
        ("scrnsaverproto" ,scrnsaverproto)
        ("pkg-config" ,pkg-config)))
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public libxt
(define-public scrnsaverproto
  (package
    (name "libxt")
    (version "1.1.3")
    (name "scrnsaverproto")
    (version "1.2.2")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXt-"
               "mirror://xorg/X11R7.7/src/everything/scrnsaverproto-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1g85gwnhs7lg5f01gfi1cpb916xc3spm1fjlv2f4xz2zzk1r7dcd"))))
            "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb"))))
    (build-system gnu-build-system)
    (inputs
      `(("xproto" ,xproto)
        ("libx11" ,libx11)
        ("libsm" ,libsm)
        ("kbproto" ,kbproto)
        ("libice" ,libice)
        ("pkg-config" ,pkg-config)))
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public libxtst
(define-public sessreg
  (package
    (name "libxtst")
    (version "1.2.1")
    (name "sessreg")
    (version "1.0.7")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXtst-"
               "mirror://xorg/X11R7.7/src/everything/sessreg-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1q750hjplq1rfyxkr4545z1y2a1wfnc828ynvbws7b4jwdk3xsky"))))
            "0lifgjxdvc6lwyjk90slddnr12fsv88ldy6qhklr5av409cfwd47"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxi" ,libxi)
        ("xextproto" ,xextproto)
        ("libxext" ,libxext)
        ("libx11" ,libx11)
        ("recordproto" ,recordproto)
        ("inputproto" ,inputproto)
        ("pkg-config" ,pkg-config)))
      `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public libxv
(define-public setxkbmap
  (package
    (name "libxv")
    (version "1.0.7")
    (name "setxkbmap")
    (version "1.3.0")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXv-"
               "mirror://xorg/X11R7.7/src/everything/setxkbmap-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx"))))
            "1inygpvlgc6vr5h9laxw9lnvafnccl3fy0g5n9ll28iq3yfmqc1x"))))
    (build-system gnu-build-system)
    (inputs
      `(("xproto" ,xproto)
        ("xextproto" ,xextproto)
        ("libxext" ,libxext)
      `(("libxkbfile" ,libxkbfile)
        ("libx11" ,libx11)
        ("videoproto" ,videoproto)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 2074,28 1998,26 @@
    (license license:x11)))


(define-public libxvmc
(define-public smproxy
  (package
    (name "libxvmc")
    (version "1.0.7")
    (name "smproxy")
    (version "1.0.5")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXvMC-"
               "mirror://xorg/X11R7.7/src/everything/smproxy-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18"))))
            "02fn5wa1gs2jap6sr9j9yk6zsvz82j8l61pf74iyqwa99q4wnb67"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxv" ,libxv)
        ("xproto" ,xproto)
        ("xextproto" ,xextproto)
        ("libxext" ,libxext)
        ("libx11" ,libx11)
        ("videoproto" ,videoproto)
      `(("libxt" ,libxt)
        ("libxmu" ,libxmu)
        ("libsm" ,libsm)
        ("libice" ,libice)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 2103,137 2025,146 @@
    (license license:x11)))


(define-public libxxf86dga
(define-public util-macros
  (package
    (name "libxxf86dga")
    (version "1.1.3")
    (name "util-macros")
    (version "1.17")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXxf86dga-"
               "mirror://xorg/X11R7.7/src/everything/util-macros-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "15291ddhyr54sribwbg8hxx2psgzm5gh0pgkw5yrf3zgvdsa67sm"))))
            "1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public libxxf86vm
(define-public videoproto
  (package
    (name "libxxf86vm")
    (version "1.1.2")
    (name "videoproto")
    (version "2.3.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXxf86vm-"
               "mirror://xorg/X11R7.7/src/everything/videoproto-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "117w92xz39rcqcahspi48nc04cc9110x1dycpf3vbcb6p0pifr55"))))
            "0nk3i6gwkqq1w8zwn7bxz344pi1dwcjrmf6hr330h7hxjcj6viry"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public luit
(define-public windowswmproto
  (package
    (name "luit")
    (version "1.1.1")
    (name "windowswmproto")
    (version "1.0.4")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/luit-"
               "mirror://xorg/X11R7.7/src/everything/windowswmproto-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h"))))
            "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0"))))
    (build-system gnu-build-system)
    (inputs
      `(("libfontenc" ,libfontenc)
        ("pkg-config" ,pkg-config)))
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public makedepend
(define-public x11perf
  (package
    (name "makedepend")
    (version "1.0.4")
    (name "x11perf")
    (version "1.5.4")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/makedepend-"
               "mirror://xorg/X11R7.7/src/everything/x11perf-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1zpp2b9dfvlnfj2i1mzdyn785rpl7vih5lap7kcpiv80xspbhmmb"))))
            "111iwpxhnxjiq44w96zf0kszg5zpgv1g3ayx18v4nhdzl9bqivi4"))))
    (build-system gnu-build-system)
    (inputs
      `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
      `(("libx11" ,libx11)
        ("libxft" ,libxft)
        ("libxmu" ,libxmu)
        ("libxrender" ,libxrender)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public mkfontdir
(define-public xauth
  (package
    (name "mkfontdir")
    (name "xauth")
    (version "1.0.7")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/mkfontdir-"
               "mirror://xorg/X11R7.7/src/everything/xauth-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman"))))
            "1382wdfiakgckbw1xxavzh1nm34q21b1zzy96qp7ws66xc48rxw4"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (inputs
      `(("libxmu" ,libxmu)
        ("libxext" ,libxext)
        ("libxau" ,libxau)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public mkfontscale
(define-public xbacklight
  (package
    (name "mkfontscale")
    (version "1.1.0")
    (name "xbacklight")
    (version "1.1.2")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/mkfontscale-"
               "mirror://xorg/X11R7.7/src/everything/xbacklight-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1539h3ws66vcql6sf2831bcs0r4d9b05lcgpswkw33lvcxighmff"))))
            "02b5jfys2msla2yvg5s0knzyxg2104r25czkwd49i8g8kp804bxg"))))
    (build-system gnu-build-system)
    (inputs
      `(("zlib" ,zlib)
        ("xproto" ,xproto)
        ("freetype" ,freetype)
        ("libfontenc" ,libfontenc)
      `(("libx11" ,libx11)
        ("libxrandr" ,libxrandr)
        ("libxrender" ,libxrender)
        ("libxcb" ,libxcb)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 2241,20 2172,20 @@
    (license license:x11)))


(define-public randrproto
(define-public xbitmaps
  (package
    (name "randrproto")
    (version "1.3.2")
    (name "xbitmaps")
    (version "1.1.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/randrproto-"
               "mirror://xorg/X11R7.7/src/everything/xbitmaps-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0wfwcq85wbm0g5r0snc7prgki1wi3kxrxhcxinyr54n45ihh03fr"))))
            "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")


@@ 2263,42 2194,43 @@
    (license license:x11)))


(define-public recordproto
(define-public xcb-proto
  (package
    (name "recordproto")
    (version "1.14.2")
    (name "xcb-proto")
    (version "1.7.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/recordproto-"
               "mirror://xorg/X11R7.7/src/everything/xcb-proto-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7"))))
            "0ds4qg6slidrzyz6q9ckq0a19hn6blzpnvciy4brh741gn49jpdd"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (inputs
      `(("pkg-config" ,pkg-config) ("python" ,python)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public renderproto
(define-public xcmiscproto
  (package
    (name "renderproto")
    (version "0.11.1")
    (name "xcmiscproto")
    (version "1.2.2")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/renderproto-"
               "mirror://xorg/X11R7.7/src/everything/xcmiscproto-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6"))))
            "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")


@@ 2307,91 2239,110 @@
    (license license:x11)))


(define-public resourceproto
(define-public xcmsdb
  (package
    (name "resourceproto")
    (version "1.2.0")
    (name "xcmsdb")
    (version "1.0.4")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/resourceproto-"
               "mirror://xorg/X11R7.7/src/everything/xcmsdb-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw"))))
            "03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (inputs
      `(("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public scrnsaverproto
(define-public xcursor-themes
  (package
    (name "scrnsaverproto")
    (version "1.2.2")
    (name "xcursor-themes")
    (version "1.0.3")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/scrnsaverproto-"
               "mirror://xorg/X11R7.7/src/everything/xcursor-themes-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb"))))
            "1is4bak0qkkhv63mfa5l7492r475586y52yzfxyv3psppn662ilr"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (inputs
      `(("libxcursor" ,libxcursor)
        ("pkg-config" ,pkg-config)
        ("xcursorgen" ,xcursorgen)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public sessreg
(define-public xcursorgen
  (package
    (name "sessreg")
    (version "1.0.7")
    (name "xcursorgen")
    (version "1.0.5")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/sessreg-"
               "mirror://xorg/X11R7.7/src/everything/xcursorgen-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0lifgjxdvc6lwyjk90slddnr12fsv88ldy6qhklr5av409cfwd47"))))
            "10f5wk1326mm45gvgpf4m2p0j80fcd0i4c52zikahb91zah72wdw"))))
    (build-system gnu-build-system)
    (inputs
      `(("xproto" ,xproto) ("pkg-config" ,pkg-config)))
      `(("libxcursor" ,libxcursor)
        ("libx11" ,libx11)
        ("libpng" ,libpng)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public setxkbmap
(define-public xdpyinfo
  (package
    (name "setxkbmap")
    (name "xdpyinfo")
    (version "1.3.0")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/setxkbmap-"
               "mirror://xorg/X11R7.7/src/everything/xdpyinfo-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1inygpvlgc6vr5h9laxw9lnvafnccl3fy0g5n9ll28iq3yfmqc1x"))))
            "0gypsvpmay3lsh3b1dg29pjxv95pkrr21d4w6ys02mrbld24kvi3"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxkbfile" ,libxkbfile)
      `(("inputproto" ,inputproto)
        ("libxxf86vm" ,libxxf86vm)
;;         ("libxxf86misc" ,libxxf86misc)
        ("libxxf86dga" ,libxxf86dga)
        ("libxtst" ,libxtst)
        ("libxrender" ,libxrender)
        ("libxinerama" ,libxinerama)
        ("libxi" ,libxi)
        ("libxext" ,libxext)
        ("libxcomposite" ,libxcomposite)
        ("libxcb" ,libxcb)
        ("libx11" ,libx11)
        ("libdmx" ,libdmx)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 2399,26 2350,26 @@
    (license license:x11)))


(define-public smproxy
(define-public xdriinfo
  (package
    (name "smproxy")
    (version "1.0.5")
    (name "xdriinfo")
    (version "1.0.4")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/smproxy-"
               "mirror://xorg/X11R7.7/src/everything/xdriinfo-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "02fn5wa1gs2jap6sr9j9yk6zsvz82j8l61pf74iyqwa99q4wnb67"))))
            "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxt" ,libxt)
        ("libxmu" ,libxmu)
        ("libsm" ,libsm)
        ("libice" ,libice)
      `(;;("mesa" ,mesa)
        ("glproto" ,glproto)
        ("libx11" ,libx11)
        ("glproto" ,glproto)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 2426,42 2377,47 @@
    (license license:x11)))


(define-public util-macros
(define-public xev
  (package
    (name "util-macros")
    (version "1.17")
    (name "xev")
    (version "1.2.0")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/util-macros-"
               "mirror://xorg/X11R7.7/src/everything/xev-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx"))))
            "13xk5z7vy87rnn4574z0jfzymdivyc7pl4axim81sx0pmdysg1ip"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (inputs
      `(("libxrender" ,libxrender)
        ("libxrandr" ,libxrandr)
        ("xproto" ,xproto)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public videoproto
(define-public xextproto
  (package
    (name "videoproto")
    (version "2.3.1")
    (name "xextproto")
    (version "7.2.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/videoproto-"
               "mirror://xorg/X11R7.7/src/everything/xextproto-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0nk3i6gwkqq1w8zwn7bxz344pi1dwcjrmf6hr330h7hxjcj6viry"))))
            "06kdanbnprxvgl56l5h0lqj4b0f1fbb1ndha33mv5wvy802v2lvw"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")


@@ 2470,20 2426,20 @@
    (license license:x11)))


(define-public windowswmproto
(define-public xf86-input-evdev
  (package
    (name "windowswmproto")
    (version "1.0.4")
    (name "xf86-input-evdev")
    (version "2.7.0")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/windowswmproto-"
               "mirror://xorg/X11R7.7/src/everything/xf86-input-evdev-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0"))))
            "1ivf5n821chckrgp89mpb18zi00v1hyrkc1hr82q0x6g1kpgxq9y"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")


@@ 2492,94 2448,86 @@
    (license license:x11)))


(define-public x11perf
(define-public xf86-input-joystick
  (package
    (name "x11perf")
    (version "1.5.4")
    (name "xf86-input-joystick")
    (version "1.6.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/x11perf-"
               "mirror://xorg/X11R7.7/src/everything/xf86-input-joystick-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "111iwpxhnxjiq44w96zf0kszg5zpgv1g3ayx18v4nhdzl9bqivi4"))))
            "1xgpkdmfw4ahjlva97gs9sllzw8nlpa8mxj59g28fxhak67mvv8x"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xauth
(define-public xf86-input-keyboard
  (package
    (name "xauth")
    (version "1.0.7")
    (name "xf86-input-keyboard")
    (version "1.6.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xauth-"
               "mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1382wdfiakgckbw1xxavzh1nm34q21b1zzy96qp7ws66xc48rxw4"))))
            "1hwc1bjw5mxv186xbrxiky0agfglwqg8fsxqdh4br1vzgxpck7ma"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxmu" ,libxmu)
        ("libxext" ,libxext)
        ("libxau" ,libxau)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xbacklight
(define-public xf86-input-mouse
  (package
    (name "xbacklight")
    (version "1.1.2")
    (name "xf86-input-mouse")
    (version "1.7.2")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xbacklight-"
               "mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "02b5jfys2msla2yvg5s0knzyxg2104r25czkwd49i8g8kp804bxg"))))
            "0fs1lwnycyv3d0m6l2wrnlgvbs8qw66d93hwlnmrsswfq5bp6ark"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxrender" ,libxrender)
;;        ("xcb-util" ,xcb-util)
        ("libxcb" ,libxcb)
        ("pkg-config" ,pkg-config)))
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xbitmaps
(define-public xf86-input-synaptics
  (package
    (name "xbitmaps")
    (version "1.1.1")
    (name "xf86-input-synaptics")
    (version "1.6.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xbitmaps-"
               "mirror://xorg/X11R7.7/src/everything/xf86-input-synaptics-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n"))))
            "0g5b1s6q1dg38l8y47cwg7cs5nivwj0agmp71g273ws0lfg4bc8s"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")


@@ 2588,43 2536,42 @@
    (license license:x11)))


(define-public xcb-proto
(define-public xf86-input-vmmouse
  (package
    (name "xcb-proto")
    (version "1.7.1")
    (name "xf86-input-vmmouse")
    (version "12.8.0")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xcb-proto-"
               "mirror://xorg/X11R7.7/src/everything/xf86-input-vmmouse-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0ds4qg6slidrzyz6q9ckq0a19hn6blzpnvciy4brh741gn49jpdd"))))
            "16l65mnjb1xxav6c5q0xhhqih81bzify2c5qrhqc2j3waq5yr9m8"))))
    (build-system gnu-build-system)
    (inputs
      `(("pkg-config" ,pkg-config) ("python" ,python)))
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xcmiscproto
(define-public xf86-input-void
  (package
    (name "xcmiscproto")
    (version "1.2.2")
    (name "xf86-input-void")
    (version "1.4.0")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xcmiscproto-"
               "mirror://xorg/X11R7.7/src/everything/xf86-input-void-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi"))))
            "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")


@@ 2633,183 2580,174 @@
    (license license:x11)))


(define-public xcmsdb
(define-public xf86-video-ark
  (package
    (name "xcmsdb")
    (version "1.0.4")
    (name "xf86-video-ark")
    (version "0.7.4")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xcmsdb-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-ark-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74"))))
            "194zc35ivfh3vcxcilf9nbi88c2di8kbh84x535cljlpiajdnk5x"))))
    (build-system gnu-build-system)
    (inputs
      `(("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xcursor-themes
(define-public xf86-video-ast
  (package
    (name "xcursor-themes")
    (version "1.0.3")
    (name "xf86-video-ast")
    (version "0.93.10")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xcursor-themes-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-ast-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1is4bak0qkkhv63mfa5l7492r475586y52yzfxyv3psppn662ilr"))))
            "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxcursor" ,libxcursor)
        ("pkg-config" ,pkg-config)))
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xcursorgen
(define-public xf86-video-ati
  (package
    (name "xcursorgen")
    (version "1.0.5")
    (name "xf86-video-ati")
    (version "6.14.4")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xcursorgen-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-ati-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "10f5wk1326mm45gvgpf4m2p0j80fcd0i4c52zikahb91zah72wdw"))))
            "11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxcursor" ,libxcursor)
        ("libx11" ,libx11)
        ("libpng" ,libpng)
        ("pkg-config" ,pkg-config)))
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xdpyinfo
(define-public xf86-video-cirrus
  (package
    (name "xdpyinfo")
    (version "1.3.0")
    (name "xf86-video-cirrus")
    (version "1.4.0")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xdpyinfo-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-cirrus-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0gypsvpmay3lsh3b1dg29pjxv95pkrr21d4w6ys02mrbld24kvi3"))))
            "0blnbspj4936wy46lp346s4b08dfcray6yicsxvv5b4699fzl1rb"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxxf86vm" ,libxxf86vm)
;;         ("libxxf86misc" ,libxxf86misc)
        ("libxxf86dga" ,libxxf86dga)
        ("libxtst" ,libxtst)
        ("libxrender" ,libxrender)
        ("libxinerama" ,libxinerama)
        ("libxi" ,libxi)
        ("libxext" ,libxext)
        ("libxcomposite" ,libxcomposite)
        ("libxcb" ,libxcb)
        ("libx11" ,libx11)
        ("libdmx" ,libdmx)
        ("pkg-config" ,pkg-config)))
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xdriinfo
;; (define-public xf86-video-dummy
;;   (package
;;     (name "xf86-video-dummy")
;;     (version "0.3.5")
;;     (source
;;       (origin
;;         (method url-fetch)
;;         (uri (string-append
;;                "mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-"
;;                version
;;                ".tar.bz2"))
;;         (sha256
;;           (base32
;;             "0pyr50kqh7g84r4p0x09ay5kxax20dip9sh8h3cbd4xv8cswdbfm"))))
;;     (build-system gnu-build-system)
;;     (inputs `(("pkg-config" ,pkg-config)))
;;     (home-page "http://www.x.org/wiki/")
;;     (synopsis "xorg implementation of the X Window System")
;;     (description "X.org provides an implementation of the X Window System")
;;     (license non-free)))


(define-public xf86-video-fbdev
  (package
    (name "xdriinfo")
    (version "1.0.4")
    (name "xf86-video-fbdev")
    (version "0.4.2")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xdriinfo-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-fbdev-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim"))))
            "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk"))))
    (build-system gnu-build-system)
    (inputs
      `(;;("mesa" ,mesa)
        ("glproto" ,glproto)
        ("libx11" ,libx11)
        ("glproto" ,glproto)
        ("pkg-config" ,pkg-config)))
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xev
(define-public xf86-video-geode
  (package
    (name "xev")
    (version "1.2.0")
    (name "xf86-video-geode")
    (version "2.11.13")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xev-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-geode-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "13xk5z7vy87rnn4574z0jfzymdivyc7pl4axim81sx0pmdysg1ip"))))
            "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxrender" ,libxrender)
        ("libxrandr" ,libxrandr)
        ("xproto" ,xproto)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xextproto
(define-public xf86-video-glide
  (package
    (name "xextproto")
    (version "7.2.1")
    (name "xf86-video-glide")
    (version "1.2.0")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xextproto-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-glide-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "06kdanbnprxvgl56l5h0lqj4b0f1fbb1ndha33mv5wvy802v2lvw"))))
            "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")


@@ 2818,503 2756,526 @@
    (license license:x11)))


(define-public xf86-input-evdev
(define-public xf86-video-glint
  (package
    (name "xf86-input-evdev")
    (version "2.7.0")
    (name "xf86-video-glint")
    (version "1.2.7")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-input-evdev-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-glint-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1ivf5n821chckrgp89mpb18zi00v1hyrkc1hr82q0x6g1kpgxq9y"))))
            "0nf36jryabpncqq4m6sfsnmzk00f7gvfmjnl8l8sfy7w6sa6iacs"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-input-joystick
(define-public xf86-video-i128
  (package
    (name "xf86-input-joystick")
    (version "1.6.1")
    (name "xf86-video-i128")
    (version "1.3.5")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-input-joystick-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-i128-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1xgpkdmfw4ahjlva97gs9sllzw8nlpa8mxj59g28fxhak67mvv8x"))))
            "1sik8ck410hb2885vy7rlc590hw5br8lr2fzxgmv55jyawgfpv9y"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-input-keyboard
(define-public xf86-video-intel
  (package
    (name "xf86-input-keyboard")
    (version "1.6.1")
    (name "xf86-video-intel")
    (version "2.19.0")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-intel-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1hwc1bjw5mxv186xbrxiky0agfglwqg8fsxqdh4br1vzgxpck7ma"))))
            "1g742szymajh88a5dw08sxcr45bmxgc4w3m6hddv9qscn5hks4rj"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-input-mouse
(define-public xf86-video-mach64
  (package
    (name "xf86-input-mouse")
    (version "1.7.2")
    (name "xf86-video-mach64")
    (version "6.9.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-mach64-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0fs1lwnycyv3d0m6l2wrnlgvbs8qw66d93hwlnmrsswfq5bp6ark"))))
            "0kl3kvpc2ny48z89313i9fi4cxzwb2pllvxcr9j5ly680ygx8slz"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-input-synaptics
(define-public xf86-video-mga
  (package
    (name "xf86-input-synaptics")
    (version "1.6.1")
    (name "xf86-video-mga")
    (version "1.5.0")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-input-synaptics-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-mga-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0g5b1s6q1dg38l8y47cwg7cs5nivwj0agmp71g273ws0lfg4bc8s"))))
            "03l3wz5kz0hmxmzqqbkgn7pf9d956jlag04rb701a0fr1mw3v66a"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-input-vmmouse
(define-public xf86-video-neomagic
  (package
    (name "xf86-input-vmmouse")
    (version "12.8.0")
    (name "xf86-video-neomagic")
    (version "1.2.6")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-input-vmmouse-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-neomagic-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "16l65mnjb1xxav6c5q0xhhqih81bzify2c5qrhqc2j3waq5yr9m8"))))
            "124qci48xrk0w2jy91n7vqs7s6q397zyiqqszhmkx6ld7six57mi"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-input-void
(define-public xf86-video-newport
  (package
    (name "xf86-input-void")
    (version "1.4.0")
    (name "xf86-video-newport")
    (version "0.2.4")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-input-void-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-newport-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a"))))
            "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-video-ark
(define-public xf86-video-nv
  (package
    (name "xf86-video-ark")
    (version "0.7.4")
    (name "xf86-video-nv")
    (version "2.1.18")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-ark-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-nv-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "194zc35ivfh3vcxcilf9nbi88c2di8kbh84x535cljlpiajdnk5x"))))
            "05glbi9jc7j9nm4sf4qvl3z87s48ibm3i283lqz85kbphg62dxvc"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-video-ast
(define-public xf86-video-openchrome
  (package
    (name "xf86-video-ast")
    (version "0.93.10")
    (name "xf86-video-openchrome")
    (version "0.2.906")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-ast-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-openchrome-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69"))))
            "0hgzn1r7ig94xbr9dvq0bp1nxqlfp2ki8823jca3f22a2kf8wmg7"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-video-ati
(define-public xf86-video-r128
  (package
    (name "xf86-video-ati")
    (version "6.14.4")
    (name "xf86-video-r128")
    (version "6.8.2")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-ati-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-r128-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg"))))
            "1c84x40k9qz9dnf5qs6nnjcgz7px6mpc3rbk8mj62zhp7mf16hbv"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-video-cirrus
(define-public xf86-video-savage
  (package
    (name "xf86-video-cirrus")
    (version "1.4.0")
    (name "xf86-video-savage")
    (version "2.3.4")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-cirrus-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-savage-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0blnbspj4936wy46lp346s4b08dfcray6yicsxvv5b4699fzl1rb"))))
            "0jdy4wv3k3ylx3lajjcbsg37z2hf6366a1jvv16sv1ln6dk6lris"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


;; (define-public xf86-video-dummy
;;   (package
;;     (name "xf86-video-dummy")
;;     (version "0.3.5")
;;     (source
;;       (origin
;;         (method url-fetch)
;;         (uri (string-append
;;                "mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-"
;;                version
;;                ".tar.bz2"))
;;         (sha256
;;           (base32
;;             "0pyr50kqh7g84r4p0x09ay5kxax20dip9sh8h3cbd4xv8cswdbfm"))))
;;     (build-system gnu-build-system)
;;     (home-page "http://www.x.org/wiki/")
;;     (synopsis "xorg implementation of the X Window System")
;;     (description "X.org provides an implementation of the X Window System")
;;     (license non-free)))


(define-public xf86-video-fbdev
(define-public xf86-video-siliconmotion
  (package
    (name "xf86-video-fbdev")
    (version "0.4.2")
    (name "xf86-video-siliconmotion")
    (version "1.7.6")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-fbdev-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-siliconmotion-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk"))))
            "01sdl6ky1vmvmfgx2d44i35rqafi0z07xdy40cvindcr2k91p7x5"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-video-geode
(define-public xf86-video-sis
  (package
    (name "xf86-video-geode")
    (version "2.11.13")
    (name "xf86-video-sis")
    (version "0.10.4")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-geode-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-sis-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk"))))
            "03diq0l93lfsipmwkpdb2ysgbxxryl6yakpghzc3fksjxa01112f"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))
    (license license:bsd-3)))


(define-public xf86-video-glide
(define-public xf86-video-suncg6
  (package
    (name "xf86-video-glide")
    (version "1.2.0")
    (name "xf86-video-suncg6")
    (version "1.1.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-glide-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-suncg6-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l"))))
            "07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-video-glint
(define-public xf86-video-sunffb
  (package
    (name "xf86-video-glint")
    (version "1.2.7")
    (name "xf86-video-sunffb")
    (version "1.2.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-glint-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-sunffb-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0nf36jryabpncqq4m6sfsnmzk00f7gvfmjnl8l8sfy7w6sa6iacs"))))
            "04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-video-i128
(define-public xf86-video-tdfx
  (package
    (name "xf86-video-i128")
    (version "1.3.5")
    (name "xf86-video-tdfx")
    (version "1.4.4")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-i128-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-tdfx-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1sik8ck410hb2885vy7rlc590hw5br8lr2fzxgmv55jyawgfpv9y"))))
            "124gsi30rj547jjd7gvv7xykfnwlyrxw0gcacamby7pvl3g33fg0"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-video-intel
(define-public xf86-video-tga
  (package
    (name "xf86-video-intel")
    (version "2.19.0")
    (name "xf86-video-tga")
    (version "1.2.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-intel-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-tga-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1g742szymajh88a5dw08sxcr45bmxgc4w3m6hddv9qscn5hks4rj"))))
            "0mdqrn02zzkdnmhg4vh9djaawg6b2p82g5qbj66z8b30yr77b93h"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-video-mach64
(define-public xf86-video-trident
  (package
    (name "xf86-video-mach64")
    (version "6.9.1")
    (name "xf86-video-trident")
    (version "1.3.5")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-mach64-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-trident-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0kl3kvpc2ny48z89313i9fi4cxzwb2pllvxcr9j5ly680ygx8slz"))))
            "02y5pzdp0a1c12jr8gghbrzgbyfbgq67x7kd7n4f323pmf8x1csb"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-video-mga
;; (define-public xf86-video-v4l
;;   (package
;;     (name "xf86-video-v4l")
;;     (version "0.2.0")
;;     (source
;;       (origin
;;         (method url-fetch)
;;         (uri (string-append
;;                "mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-"
;;                version
;;                ".tar.bz2"))
;;         (sha256
;;           (base32
;;             "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb"))))
;;     (build-system gnu-build-system)
;;     (inputs `(("pkg-config" ,pkg-config)))
;;     (home-page "http://www.x.org/wiki/")
;;     (synopsis "xorg implementation of the X Window System")
;;     (description "X.org provides an implementation of the X Window System")
;;     (license none)))


(define-public xf86-video-vesa
  (package
    (name "xf86-video-mga")
    (version "1.5.0")
    (name "xf86-video-vesa")
    (version "2.3.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-mga-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-vesa-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "03l3wz5kz0hmxmzqqbkgn7pf9d956jlag04rb701a0fr1mw3v66a"))))
            "0wqms28kkz2fvghqhqwp6w8zj7k5cgwnhzvkc7j4v268bf6h78g4"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-video-neomagic
(define-public xf86-video-vmware
  (package
    (name "xf86-video-neomagic")
    (version "1.2.6")
    (name "xf86-video-vmware")
    (version "12.0.2")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-neomagic-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "124qci48xrk0w2jy91n7vqs7s6q397zyiqqszhmkx6ld7six57mi"))))
            "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-video-newport
(define-public xf86-video-voodoo
  (package
    (name "xf86-video-newport")
    (version "0.2.4")
    (name "xf86-video-voodoo")
    (version "1.2.4")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-newport-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-voodoo-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"))))
            "0ha748yz92yzn6hp2rhin3il8f4j2rs4vkgdvqkagnv1ryxkh0ph"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-video-nv
(define-public xf86-video-wsfb
  (package
    (name "xf86-video-nv")
    (version "2.1.18")
    (name "xf86-video-wsfb")
    (version "0.4.0")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-nv-"
               "mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "05glbi9jc7j9nm4sf4qvl3z87s48ibm3i283lqz85kbphg62dxvc"))))
            "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))
    (license license:bsd-2)))


(define-public xf86-video-openchrome
(define-public xf86bigfontproto
  (package
    (name "xf86-video-openchrome")
    (version "0.2.906")
    (name "xf86bigfontproto")
    (version "1.2.0")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-openchrome-"
               "mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0hgzn1r7ig94xbr9dvq0bp1nxqlfp2ki8823jca3f22a2kf8wmg7"))))
            "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms"))))
    (build-system gnu-build-system)
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 3322,20 3283,20 @@
    (license license:x11)))


(define-public xf86-video-r128
(define-public xf86dgaproto
  (package
    (name "xf86-video-r128")
    (version "6.8.2")
    (name "xf86dgaproto")
    (version "2.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-r128-"
               "mirror://xorg/X11R7.7/src/everything/xf86dgaproto-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1c84x40k9qz9dnf5qs6nnjcgz7px6mpc3rbk8mj62zhp7mf16hbv"))))
            "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc"))))
    (build-system gnu-build-system)
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 3343,20 3304,20 @@
    (license license:x11)))


(define-public xf86-video-savage
(define-public xf86driproto
  (package
    (name "xf86-video-savage")
    (version "2.3.4")
    (name "xf86driproto")
    (version "2.1.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-savage-"
               "mirror://xorg/X11R7.7/src/everything/xf86driproto-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0jdy4wv3k3ylx3lajjcbsg37z2hf6366a1jvv16sv1ln6dk6lris"))))
            "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww"))))
    (build-system gnu-build-system)
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 3364,20 3325,20 @@
    (license license:x11)))


(define-public xf86-video-siliconmotion
(define-public xf86vidmodeproto
  (package
    (name "xf86-video-siliconmotion")
    (version "1.7.6")
    (name "xf86vidmodeproto")
    (version "2.3.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-siliconmotion-"
               "mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "01sdl6ky1vmvmfgx2d44i35rqafi0z07xdy40cvindcr2k91p7x5"))))
            "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5"))))
    (build-system gnu-build-system)
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 3385,338 3346,440 @@
    (license license:x11)))


(define-public xf86-video-sis
(define-public xgamma
  (package
    (name "xf86-video-sis")
    (version "0.10.4")
    (name "xgamma")
    (version "1.0.5")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-sis-"
               "mirror://xorg/X11R7.7/src/everything/xgamma-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "03diq0l93lfsipmwkpdb2ysgbxxryl6yakpghzc3fksjxa01112f"))))
            "0463sawps86jnxn121ramsz4sicy3az5wa5wsq4rqm8dm3za48p3"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxxf86vm" ,libxxf86vm)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:bsd-3)))
    (license license:x11)))


(define-public xf86-video-suncg6
(define-public xhost
  (package
    (name "xf86-video-suncg6")
    (version "1.1.1")
    (name "xhost")
    (version "1.0.5")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-suncg6-"
               "mirror://xorg/X11R7.7/src/everything/xhost-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi"))))
            "0l483y6wfrjh37j16b41kpi2nc7ss5rvndafpbaylrs87ygx2w18"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxmu" ,libxmu)
        ("libxau" ,libxau)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-video-sunffb
(define-public xineramaproto
  (package
    (name "xf86-video-sunffb")
    (name "xineramaproto")
    (version "1.2.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-sunffb-"
               "mirror://xorg/X11R7.7/src/everything/xineramaproto-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx"))))
            "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-video-tdfx
(define-public xinput
  (package
    (name "xf86-video-tdfx")
    (version "1.4.4")
    (name "xinput")
    (version "1.6.0")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-tdfx-"
               "mirror://xorg/X11R7.7/src/everything/xinput-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "124gsi30rj547jjd7gvv7xykfnwlyrxw0gcacamby7pvl3g33fg0"))))
            "0zl4cdgnzh9shz20yn7hz889v4nkbyqwx0nb7dh6arn7abchgc2a"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxrender" ,libxrender)
        ("libxrandr" ,libxrandr)
        ("libxinerama" ,libxinerama)
        ("libxi" ,libxi)
        ("libxext" ,libxext)
        ("libx11" ,libx11)
        ("inputproto" ,inputproto)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-video-tga
(define-public xkbcomp
  (package
    (name "xf86-video-tga")
    (version "1.2.1")
    (name "xkbcomp")
    (version "1.2.4")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-tga-"
               "mirror://xorg/X11R7.7/src/everything/xkbcomp-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0mdqrn02zzkdnmhg4vh9djaawg6b2p82g5qbj66z8b30yr77b93h"))))
            "0bas1d2wjiy5zy9d0g92d2p9pwv4aapfbfidi7hxy8ax8jmwkl4i"))))
    (build-system gnu-build-system)
    (inputs
      `(("xproto" ,xproto)
        ("libxkbfile" ,libxkbfile)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-video-trident
(define-public xkbevd
  (package
    (name "xf86-video-trident")
    (version "1.3.5")
    (name "xkbevd")
    (version "1.1.3")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-trident-"
               "mirror://xorg/X11R7.7/src/everything/xkbevd-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "02y5pzdp0a1c12jr8gghbrzgbyfbgq67x7kd7n4f323pmf8x1csb"))))
            "05h1xcnbalndbrryyqs8wzy9h3wz655vc0ymhlk2q4aik17licjm"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxkbfile" ,libxkbfile)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


;; (define-public xf86-video-v4l
;;   (package
;;     (name "xf86-video-v4l")
;;     (version "0.2.0")
;;     (source
;;       (origin
;;         (method url-fetch)
;;         (uri (string-append
;;                "mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-"
;;                version
;;                ".tar.bz2"))
;;         (sha256
;;           (base32
;;             "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb"))))
;;     (build-system gnu-build-system)
;;     (home-page "http://www.x.org/wiki/")
;;     (synopsis "xorg implementation of the X Window System")
;;     (description "X.org provides an implementation of the X Window System")
;;     (license none)))


(define-public xf86-video-vesa
(define-public xkbutils
  (package
    (name "xf86-video-vesa")
    (version "2.3.1")
    (name "xkbutils")
    (version "1.0.3")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-vesa-"
               "mirror://xorg/X11R7.7/src/everything/xkbutils-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0wqms28kkz2fvghqhqwp6w8zj7k5cgwnhzvkc7j4v268bf6h78g4"))))
            "1ga913pw6chssf2016kjyjl6ar2lj83pa497w97ak2kq603sy2g4"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxt" ,libxt)
        ("xproto" ,xproto)
        ("libxaw" ,libxaw)
        ("libx11" ,libx11)
        ("inputproto" ,inputproto)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-video-vmware
(define-public xkeyboard-config
  (package
    (name "xf86-video-vmware")
    (version "12.0.2")
    (name "xkeyboard-config")
    (version "2.6")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-"
               "mirror://xorg/X11R7.7/src/everything/xkeyboard-config-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8"))))
            "1nmb7ma8rqryicc5xqrn2hm5pwp5lkf7nj28bwbf63mz2r0mk892"))))
    (build-system gnu-build-system)
    (inputs
      `(("libx11" ,libx11)
        ("pkg-config" ,pkg-config)
        ("xkbcomp" ,xkbcomp)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-video-voodoo
(define-public xkill
  (package
    (name "xf86-video-voodoo")
    (version "1.2.4")
    (name "xkill")
    (version "1.0.3")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-voodoo-"
               "mirror://xorg/X11R7.7/src/everything/xkill-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0ha748yz92yzn6hp2rhin3il8f4j2rs4vkgdvqkagnv1ryxkh0ph"))))
            "1ac110qbb9a4x1dim3vaghvdk3jc708i2p3f4rmag33458khg0xx"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxmu" ,libxmu)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86-video-wsfb
(define-public xlsatoms
  (package
    (name "xf86-video-wsfb")
    (version "0.4.0")
    (name "xlsatoms")
    (version "1.1.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-"
               "mirror://xorg/X11R7.7/src/everything/xlsatoms-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"))))
            "1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxcb" ,libxcb)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:bsd-2)))
    (license license:x11)))


(define-public xf86bigfontproto
(define-public xlsclients
  (package
    (name "xf86bigfontproto")
    (version "1.2.0")
    (name "xlsclients")
    (version "1.1.2")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-"
               "mirror://xorg/X11R7.7/src/everything/xlsclients-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms"))))
            "1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxcb" ,libxcb)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86dgaproto
(define-public xmodmap
  (package
    (name "xf86dgaproto")
    (version "2.1")
    (name "xmodmap")
    (version "1.0.7")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86dgaproto-"
               "mirror://xorg/X11R7.7/src/everything/xmodmap-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc"))))
            "1dg47lay4vhrl9mfq3cfc6741a0m2n8wd4ljagd21ix3qklys8pg"))))
    (build-system gnu-build-system)
    (inputs
      `(("xproto" ,xproto)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86driproto
;; (define-public xorg-docs
;;   (package
;;     (name "xorg-docs")
;;     (version "1.7")
;;     (source
;;       (origin
;;         (method url-fetch)
;;         (uri (string-append
;;                "mirror://xorg/X11R7.7/src/everything/xorg-docs-"
;;                version
;;                ".tar.bz2"))
;;         (sha256
;;           (base32
;;             "0prphdba6kgr1bxk7r07wxxx6x6pqjw6prr5qclypsb5sf5r3cdr"))))
;;     (build-system gnu-build-system)
;;     (inputs `(("pkg-config" ,pkg-config)))
;;     (home-page "http://www.x.org/wiki/")
;;     (synopsis "xorg implementation of the X Window System")
;;     (description "X.org provides an implementation of the X Window System")
;;     (license none)))


(define-public xorg-server
  (package
    (name "xf86driproto")
    (version "2.1.1")
    (name "xorg-server")
    (version "1.12.2")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86driproto-"
               "mirror://xorg/X11R7.7/src/everything/xorg-server-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww"))))
            "1xf57hcq6r17zxyfnx9r1wd0ir1bw13ff8bsiszwrw9jyhi9x7ya"))))
    (build-system gnu-build-system)
    (inputs
      `(("bigreqsproto" ,bigreqsproto)
        ("compositeproto" ,compositeproto)
        ("damageproto" ,damageproto)
        ("dbus" ,dbus)
        ("dmxproto" ,dmxproto)
        ("dri2proto" ,dri2proto)
        ("glproto" ,glproto)
        ("inputproto" ,inputproto)
        ("kbproto" ,kbproto)
        ("libdmx" ,libdmx)
;;        ("libdrm" ,libdrm)
        ("libpciaccess" ,libpciaccess)
        ("libx11" ,libx11)
        ("libxau" ,libxau)
        ("libxaw" ,libxaw)
        ("libxdmcp" ,libxdmcp)
        ("libxext" ,libxext)
        ("libxfixes" ,libxfixes)
        ("libxfont" ,libxfont)
        ("libxkbfile" ,libxkbfile)
        ("libxmu" ,libxmu)
        ("libxpm" ,libxpm)
        ("libxrender" ,libxrender)
        ("libxres" ,libxres)
        ("libxt" ,libxt)
        ("libxv" ,libxv)
;;        ("mesa" ,mesa)
        ("openssl" ,openssl)
;;        ("pixman" ,pixman)
        ("pkg-config" ,pkg-config)
        ("recordproto" ,recordproto)
        ("randrproto" ,randrproto)
        ("renderproto" ,renderproto)
        ("resourceproto" ,resourceproto)
        ("scrnsaverproto" ,scrnsaverproto)
;;        ("systemd" ,systemd)
        ("xcmiscproto" ,xcmiscproto)
        ("xextproto" ,xextproto)
        ("xf86bigfontproto" ,xf86bigfontproto)
        ("xf86dgaproto" ,xf86dgaproto)
        ("xf86driproto" ,xf86driproto)
        ("xf86vidmodeproto" ,xf86vidmodeproto)
        ("xineramaproto" ,xineramaproto)
        ("xtrans" ,xtrans)
        ("zlib" ,zlib)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xf86vidmodeproto
(define-public xorg-sgml-doctools
  (package
    (name "xf86vidmodeproto")
    (version "2.3.1")
    (name "xorg-sgml-doctools")
    (version "1.11")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-"
               "mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5"))))
            "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xgamma
(define-public xpr
  (package
    (name "xgamma")
    (version "1.0.5")
    (name "xpr")
    (version "1.0.4")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xgamma-"
               "mirror://xorg/X11R7.7/src/everything/xpr-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0463sawps86jnxn121ramsz4sicy3az5wa5wsq4rqm8dm3za48p3"))))
            "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxxf86vm" ,libxxf86vm)
      `(("xproto" ,xproto)
        ("libxmu" ,libxmu)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")


@@ 3725,24 3788,23 @@
    (license license:x11)))


(define-public xhost
(define-public xprop
  (package
    (name "xhost")
    (version "1.0.5")
    (name "xprop")
    (version "1.2.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xhost-"
               "mirror://xorg/X11R7.7/src/everything/xprop-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0l483y6wfrjh37j16b41kpi2nc7ss5rvndafpbaylrs87ygx2w18"))))
            "18zi2any13zlb7f34fzyw6lkiwkd6k2scp3b800a1f4rj0c7m407"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxmu" ,libxmu)
        ("libxau" ,libxau)
      `(("xproto" ,xproto)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")


@@ 3751,51 3813,51 @@
    (license license:x11)))


(define-public xineramaproto
(define-public xrandr
  (package
    (name "xineramaproto")
    (version "1.2.1")
    (name "xrandr")
    (version "1.3.5")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xineramaproto-"
               "mirror://xorg/X11R7.7/src/everything/xrandr-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp"))))
            "03lq1c1q4w5cf2ijs4b34v008lshibha9zv5lw08xpyhk9xgyn8h"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (inputs
      `(("libxrender" ,libxrender)
        ("libxrandr" ,libxrandr)
        ("xproto" ,xproto)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xinput
(define-public xrdb
  (package
    (name "xinput")
    (version "1.6.0")
    (name "xrdb")
    (version "1.0.9")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xinput-"
               "mirror://xorg/X11R7.7/src/everything/xrdb-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0zl4cdgnzh9shz20yn7hz889v4nkbyqwx0nb7dh6arn7abchgc2a"))))
            "1dza5a34nj68fzhlgwf18i5bk0n24ig28yihwpjy7vwn57hh2934"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxrender" ,libxrender)
        ("libxrandr" ,libxrandr)
        ("libxinerama" ,libxinerama)
        ("libxi" ,libxi)
        ("libxext" ,libxext)
      `(("libxmu" ,libxmu)
        ("libx11" ,libx11)
        ("inputproto" ,inputproto)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 3803,25 3865,23 @@
    (license license:x11)))


(define-public xkbcomp
(define-public xrefresh
  (package
    (name "xkbcomp")
    (version "1.2.4")
    (name "xrefresh")
    (version "1.0.4")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xkbcomp-"
               "mirror://xorg/X11R7.7/src/everything/xrefresh-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0bas1d2wjiy5zy9d0g92d2p9pwv4aapfbfidi7hxy8ax8jmwkl4i"))))
            "0ywxzwa4kmnnmf8idr8ssgcil9xvbhnk155zpsh2i8ay93mh5586"))))
    (build-system gnu-build-system)
    (inputs
      `(("xproto" ,xproto)
        ("libxkbfile" ,libxkbfile)
        ("libx11" ,libx11)
      `(("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 3829,23 3889,26 @@
    (license license:x11)))


(define-public xkbevd
(define-public xset
  (package
    (name "xkbevd")
    (version "1.1.3")
    (name "xset")
    (version "1.2.2")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xkbevd-"
               "mirror://xorg/X11R7.7/src/everything/xset-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "05h1xcnbalndbrryyqs8wzy9h3wz655vc0ymhlk2q4aik17licjm"))))
            "1s61mvscd0h7y6anljarj7nkii6plhs8ndx1fm8b1f1h00a1qdv1"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxkbfile" ,libxkbfile)
      `(;("libxxf86misc" ,libxxf86misc)
        ("xproto" ,xproto)
        ("libxmu" ,libxmu)
        ("libxext" ,libxext)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")


@@ 3854,27 3917,26 @@
    (license license:x11)))


(define-public xkbutils
(define-public xsetroot
  (package
    (name "xkbutils")
    (version "1.0.3")
    (name "xsetroot")
    (version "1.1.0")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xkbutils-"
               "mirror://xorg/X11R7.7/src/everything/xsetroot-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1ga913pw6chssf2016kjyjl6ar2lj83pa497w97ak2kq603sy2g4"))))
            "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxt" ,libxt)
        ("xproto" ,xproto)
        ("libxaw" ,libxaw)
      `(("libxmu" ,libxmu)
        ("libxcursor" ,libxcursor)
        ("xbitmaps" ,xbitmaps)
        ("libx11" ,libx11)
        ("inputproto" ,inputproto)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 3882,20 3944,20 @@
    (license license:x11)))


(define-public xkeyboard-config
(define-public xtrans
  (package
    (name "xkeyboard-config")
    (version "2.6")
    (name "xtrans")
    (version "1.2.7")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xkeyboard-config-"
               "mirror://xorg/X11R7.7/src/everything/xtrans-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1nmb7ma8rqryicc5xqrn2hm5pwp5lkf7nj28bwbf63mz2r0mk892"))))
            "19p1bw3qyn0ia1znx6q3gx92rr9rl88ylrfijjclm8vhpa8i30bz"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")


@@ 3904,23 3966,24 @@
    (license license:x11)))


(define-public xkill
(define-public xvinfo
  (package
    (name "xkill")
    (version "1.0.3")
    (name "xvinfo")
    (version "1.1.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xkill-"
               "mirror://xorg/X11R7.7/src/everything/xvinfo-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1ac110qbb9a4x1dim3vaghvdk3jc708i2p3f4rmag33458khg0xx"))))
            "119rd93d7661ll1rfcdssn78l0b97326smziyr2f5wdwj2hlmiv0"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxmu" ,libxmu)
      `(("libxext" ,libxext)
        ("libxv" ,libxv)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")


@@ 3929,23 3992,25 @@
    (license license:x11)))


(define-public xlsatoms
(define-public xwd
  (package
    (name "xlsatoms")
    (version "1.1.1")
    (name "xwd")
    (version "1.0.5")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xlsatoms-"
               "mirror://xorg/X11R7.7/src/everything/xwd-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv"))))
            "0fkg6msy2zg7rda2rpxb7j6vmrdmqmk72xsxnyhz97196ykjnx82"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxcb" ,libxcb)
      `(("libxt" ,libxt)
        ("xproto" ,xproto)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 3953,23 4018,25 @@
    (license license:x11)))


(define-public xlsclients
(define-public xwininfo
  (package
    (name "xlsclients")
    (name "xwininfo")
    (version "1.1.2")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xlsclients-"
               "mirror://xorg/X11R7.7/src/everything/xwininfo-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w"))))
            "0fmcr5yl03xw7m8p9h1rk67rrj7gp5x16a547xhmg8idw2f6r9lg"))))
    (build-system gnu-build-system)
    (inputs
      `(("libxcb" ,libxcb)
      `(("xproto" ,xproto)
        ("libxcb" ,libxcb)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 3977,20 4044,20 @@
    (license license:x11)))


(define-public xmodmap
(define-public xwud
  (package
    (name "xmodmap")
    (version "1.0.7")
    (name "xwud")
    (version "1.0.4")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xmodmap-"
               "mirror://xorg/X11R7.7/src/everything/xwud-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1dg47lay4vhrl9mfq3cfc6741a0m2n8wd4ljagd21ix3qklys8pg"))))
            "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn"))))
    (build-system gnu-build-system)
    (inputs
      `(("xproto" ,xproto)


@@ 4002,135 4069,109 @@
    (license license:x11)))


;; (define-public xorg-docs
;;   (package
;;     (name "xorg-docs")
;;     (version "1.7")
;;     (source
;;       (origin
;;         (method url-fetch)
;;         (uri (string-append
;;                "mirror://xorg/X11R7.7/src/everything/xorg-docs-"
;;                version
;;                ".tar.bz2"))
;;         (sha256
;;           (base32
;;             "0prphdba6kgr1bxk7r07wxxx6x6pqjw6prr5qclypsb5sf5r3cdr"))))
;;     (build-system gnu-build-system)
;;     (inputs `(("pkg-config" ,pkg-config)))
;;     (home-page "http://www.x.org/wiki/")
;;     (synopsis "xorg implementation of the X Window System")
;;     (description "X.org provides an implementation of the X Window System")
;;     (license none)))

;; packages of height 1 in the propagated-inputs tree

(define-public xorg-server
(define-public fixesproto
  (package
    (name "xorg-server")
    (version "1.12.2")
    (name "fixesproto")
    (version "5.0")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xorg-server-"
               "mirror://xorg/X11R7.7/src/everything/fixesproto-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1xf57hcq6r17zxyfnx9r1wd0ir1bw13ff8bsiszwrw9jyhi9x7ya"))))
            "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs"))))
    (build-system gnu-build-system)
    (propagated-inputs
      `(("xextproto" ,xextproto)))
    (inputs
      `(("bigreqsproto" ,bigreqsproto)
        ("compositeproto" ,compositeproto)
        ("damageproto" ,damageproto)
        ("dbus" ,dbus)
        ("dmxproto" ,dmxproto)
        ("dri2proto" ,dri2proto)
        ("glproto" ,glproto)
        ("inputproto" ,inputproto)
        ("kbproto" ,kbproto)
        ("libdmx" ,libdmx)
;;        ("libdrm" ,libdrm)
        ("libpciaccess" ,libpciaccess)
        ("libx11" ,libx11)
        ("libxau" ,libxau)
        ("libxaw" ,libxaw)
        ("libxdmcp" ,libxdmcp)
        ("libxext" ,libxext)
        ("libxfixes" ,libxfixes)
        ("libxfont" ,libxfont)
        ("libxkbfile" ,libxkbfile)
        ("libxmu" ,libxmu)
        ("libxpm" ,libxpm)
        ("libxrender" ,libxrender)
        ("libxres" ,libxres)
        ("libxt" ,libxt)
        ("libxv" ,libxv)
;;        ("mesa" ,mesa)
        ("openssl" ,openssl)
;;        ("pixman" ,pixman)
        ("pkg-config" ,pkg-config)
        ("recordproto" ,recordproto)
        ("randrproto" ,randrproto)
        ("renderproto" ,renderproto)
        ("resourceproto" ,resourceproto)
        ("scrnsaverproto" ,scrnsaverproto)
;;        ("systemd" ,systemd)
        ("xcmiscproto" ,xcmiscproto)
        ("xextproto" ,xextproto)
        ("xf86bigfontproto" ,xf86bigfontproto)
        ("xf86dgaproto" ,xf86dgaproto)
        ("xf86driproto" ,xf86driproto)
        ("xf86vidmodeproto" ,xf86vidmodeproto)
        ("xineramaproto" ,xineramaproto)
        ("xtrans" ,xtrans)
        ("zlib" ,zlib)))
      `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public libxext
  (package
    (name "libxext")
    (version "1.3.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/libXext-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0ng8clhn7srbkadxjc7ih3z3v27v9ny0aa0dqkgddgxpgrhrq8jn"))))
    (build-system gnu-build-system)
    (propagated-inputs
      `(("xextproto" ,xextproto)))
    (inputs
      `(("libxau" ,libxau)
        ("xproto" ,xproto)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xorg-sgml-doctools
(define-public libxinerama
  (package
    (name "xorg-sgml-doctools")
    (version "1.11")
    (name "libxinerama")
    (version "1.1.2")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-"
               "mirror://xorg/X11R7.7/src/everything/libXinerama-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777"))))
            "1b3aq1762hxzchd9ndavdjlksq93991s0g2z6spf8wl3v0pprrx4"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (propagated-inputs
      `(("xineramaproto" ,xineramaproto)))
    (inputs
      `(("xextproto" ,xextproto)
        ("libxext" ,libxext)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xpr
(define-public libxrender
  (package
    (name "xpr")
    (version "1.0.4")
    (name "libxrender")
    (version "0.9.7")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xpr-"
               "mirror://xorg/X11R7.7/src/everything/libXrender-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy"))))
            "1rmvja2gkf5v0k2n1bcghw8v98m2kfn3af0rbmsda5dwr69npd7r"))))
    (build-system gnu-build-system)
    (propagated-inputs
      `(("renderproto" ,renderproto)))
    (inputs
      `(("xproto" ,xproto)
        ("libxmu" ,libxmu)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")


@@ 4139,24 4180,29 @@
    (license license:x11)))


(define-public xprop
(define-public libxtst
  (package
    (name "xprop")
    (name "libxtst")
    (version "1.2.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xprop-"
               "mirror://xorg/X11R7.7/src/everything/libXtst-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "18zi2any13zlb7f34fzyw6lkiwkd6k2scp3b800a1f4rj0c7m407"))))
            "1q750hjplq1rfyxkr4545z1y2a1wfnc828ynvbws7b4jwdk3xsky"))))
    (build-system gnu-build-system)
    (propagated-inputs
      `(("recordproto" ,recordproto)))
    (inputs
      `(("xproto" ,xproto)
      `(("libxi" ,libxi)
        ("xextproto" ,xextproto)
        ("libxext" ,libxext)
        ("libx11" ,libx11)
        ("inputproto" ,inputproto)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 4164,6 4210,31 @@
    (license license:x11)))


(define-public mkfontdir
  (package
    (name "mkfontdir")
    (version "1.0.7")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/mkfontdir-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman"))))
    (build-system gnu-build-system)
    (propagated-inputs
      `(("mkfontscale" ,mkfontscale)))
    (inputs
      `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xproto
  (package
    (name "xproto")


@@ 4179,33 4250,38 @@
          (base32
            "17lkmi12f89qvg4jj5spqzwzc24fmsqq68dv6kpy7r7b944lmq5d"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (propagated-inputs
      `(("util-macros" ,util-macros))) ; to get util-macros in (almost?) all package inputs
    (inputs
      `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xrandr

;; packages of height 2 in the propagated-inputs tree

(define-public libice
  (package
    (name "xrandr")
    (version "1.3.5")
    (name "libice")
    (version "1.0.8")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xrandr-"
               "mirror://xorg/X11R7.7/src/everything/libICE-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "03lq1c1q4w5cf2ijs4b34v008lshibha9zv5lw08xpyhk9xgyn8h"))))
            "07mp13pb3s73kj7y490gnx619znzwk91mlf8kdw0rzq29ll93a94"))))
    (build-system gnu-build-system)
    (propagated-inputs
      `(("xproto" ,xproto)))
    (inputs
      `(("libxrender" ,libxrender)
        ("libxrandr" ,libxrandr)
        ("xproto" ,xproto)
        ("libx11" ,libx11)
      `(("xtrans" ,xtrans)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 4213,48 4289,55 @@
    (license license:x11)))


(define-public xrdb
(define-public libxau
  (package
    (name "xrdb")
    (version "1.0.9")
    (name "libxau")
    (version "1.0.7")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xrdb-"
               "mirror://xorg/X11R7.7/src/everything/libXau-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1dza5a34nj68fzhlgwf18i5bk0n24ig28yihwpjy7vwn57hh2934"))))
            "12d4f7sdv2pjxhk0lcay0pahccddszkw579dc59daqi37r8bllvi"))))
    (build-system gnu-build-system)
    (propagated-inputs
      `(("xproto" ,xproto)))
    (inputs
      `(("libxmu" ,libxmu)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
      `(("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xrefresh
(define-public libxaw
  (package
    (name "xrefresh")
    (version "1.0.4")
    (name "libxaw")
    (version "1.0.11")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xrefresh-"
               "mirror://xorg/X11R7.7/src/everything/libXaw-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0ywxzwa4kmnnmf8idr8ssgcil9xvbhnk155zpsh2i8ay93mh5586"))))
            "14ll7ndf5njc30hz2w197qvwp7fqj7y14wq4p1cyxlbipfn79a47"))))
    (build-system gnu-build-system)
    (propagated-inputs
      `(("libxext" ,libxext)
        ("libxmu" ,libxmu)
        ("libxpm" ,libxpm)))
    (inputs
      `(("libx11" ,libx11)
      `(("libxt" ,libxt)
        ("xproto" ,xproto)
        ("xextproto" ,xextproto)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 4262,26 4345,26 @@
    (license license:x11)))


(define-public xset
(define-public libxfixes
  (package
    (name "xset")
    (version "1.2.2")
    (name "libxfixes")
    (version "5.0")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xset-"
               "mirror://xorg/X11R7.7/src/everything/libXfixes-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1s61mvscd0h7y6anljarj7nkii6plhs8ndx1fm8b1f1h00a1qdv1"))))
            "1qx2rmwhmca2n7rgafy0arp15k5vwhdhhh6v6mx76hlj29328yjk"))))
    (build-system gnu-build-system)
    (propagated-inputs
      `(("fixesproto" ,fixesproto)))
    (inputs
      `(;("libxxf86misc" ,libxxf86misc)
        ("xproto" ,xproto)
        ("libxmu" ,libxmu)
        ("libxext" ,libxext)
      `(("xproto" ,xproto)
        ("xextproto" ,xextproto)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")


@@ 4290,26 4373,29 @@
    (license license:x11)))


(define-public xsetroot
(define-public libxfont
  (package
    (name "xsetroot")
    (version "1.1.0")
    (name "libxfont")
    (version "1.4.5")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xsetroot-"
               "mirror://xorg/X11R7.7/src/everything/libXfont-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8"))))
            "0w3irg00k6b6mziddnacln9q2rkf5848b04nvjqwv5bb1fw6zydv"))))
    (build-system gnu-build-system)
    (propagated-inputs
      `(("fontsproto" ,fontsproto)
        ("freetype" ,freetype)
        ("libfontenc" ,libfontenc)
        ("xproto" ,xproto)))
    (inputs
      `(("libxmu" ,libxmu)
        ("libxcursor" ,libxcursor)
        ("xbitmaps" ,xbitmaps)
        ("libx11" ,libx11)
      `(("zlib" ,zlib)
        ("xtrans" ,xtrans)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 4317,99 4403,127 @@
    (license license:x11)))


(define-public xtrans
(define-public libxrandr
  (package
    (name "xtrans")
    (version "1.2.7")
    (name "libxrandr")
    (version "1.3.2")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xtrans-"
               "mirror://xorg/XqqR7.7/src/everything/libXrandr-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "19p1bw3qyn0ia1znx6q3gx92rr9rl88ylrfijjclm8vhpa8i30bz"))))
            "10cvv78ws8jznma4s45dzqz0ldcxk30qgsqrc4wxfcsjmcba5b3y"))))
    (build-system gnu-build-system)
    (inputs `(("pkg-config" ,pkg-config)))
    (propagated-inputs
      `(("libxext" ,libxext)
        ("randrproto" ,randrproto)))
    (inputs
      `(("libxrender" ,libxrender)
        ("xproto" ,xproto)
        ("xextproto" ,xextproto)
        ("libx11" ,libx11)
        ("renderproto" ,renderproto)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xvinfo

;; packages of height 3 in the propagated-inputs tree

(define-public libxcb
  (package
    (name "xvinfo")
    (version "1.1.1")
    (name "libxcb")
    (version "1.8.1")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xvinfo-"
               "mirror://xorg/X11R7.7/src/everything/libxcb-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "119rd93d7661ll1rfcdssn78l0b97326smziyr2f5wdwj2hlmiv0"))))
            "03gspxcdl8r7jwbwg7fyp4cc6zic9z91amp4g5z0wwahx48nix6j"))))
    (build-system gnu-build-system)
    (propagated-inputs
      `(("libpthread-stubs" ,libpthread-stubs)
        ("libxau" ,libxau)
        ("libxdmcp" ,libxdmcp)))
    (inputs
      `(("libxext" ,libxext)
        ("libxv" ,libxv)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
      `(("xcb-proto" ,xcb-proto)
        ("libxslt" ,libxslt)
        ("pkg-config" ,pkg-config)
        ("python" ,python)
        ("xproto" ,xproto)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xwd
;; packages of height 4 in the propagated-inputs tree

(define-public libx11
  (package
    (name "xwd")
    (version "1.0.5")
    (name "libx11")
    (version "1.5.0")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xwd-"
               "mirror://xorg/X11R7.7/src/everything/libX11-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0fkg6msy2zg7rda2rpxb7j6vmrdmqmk72xsxnyhz97196ykjnx82"))))
            "11jdpl15bxwpwv0knpkh990s8jvlybng3dx477pkrz1bx7byz0n3"))))
    (build-system gnu-build-system)
    (propagated-inputs
      `(("kbproto" ,kbproto)
        ("libxcb" ,libxcb)))
    (inputs
      `(("libxt" ,libxt)
        ("xproto" ,xproto)
        ("libx11" ,libx11)
        ("pkg-config" ,pkg-config)))
      `(("inputproto" ,inputproto)
        ("libxcb" ,libxcb)
        ("pkg-config" ,pkg-config)
        ("xextproto" ,xextproto)
        ("xtrans" ,xtrans)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))


(define-public xwininfo
;; packages of height 5 in the propagated-inputs tree

(define-public libxcursor
  (package
    (name "xwininfo")
    (version "1.1.2")
    (name "libxcursor")
    (version "1.1.13")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xwininfo-"
               "mirror://xorg/X11R7.7/src/everything/libXcursor-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "0fmcr5yl03xw7m8p9h1rk67rrj7gp5x16a547xhmg8idw2f6r9lg"))))
            "13xd1dyb06gwdwb0bxb22fkgdlmis6wrljm2xk6fhz0v9bg2g27p"))))
    (build-system gnu-build-system)
    (propagated-inputs
      `(("libx11" ,libx11)
        ("libxrender" ,libxrender)
        ("libxfixes" ,libxfixes)
        ("xproto" ,xproto)))
    (inputs
      `(("xproto" ,xproto)
        ("libxcb" ,libxcb)
        ("libx11" ,libx11)
      `(("fixesproto" ,fixesproto)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")


@@ 4417,26 4531,33 @@
    (license license:x11)))


(define-public xwud
(define-public libxt
  (package
    (name "xwud")
    (version "1.0.4")
    (name "libxt")
    (version "1.1.3")
    (source
      (origin
        (method url-fetch)
        (uri (string-append
               "mirror://xorg/X11R7.7/src/everything/xwud-"
               "mirror://xorg/X11R7.7/src/everything/libXt-"
               version
               ".tar.bz2"))
        (sha256
          (base32
            "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn"))))
            "1g85gwnhs7lg5f01gfi1cpb916xc3spm1fjlv2f4xz2zzk1r7dcd"))))
    (build-system gnu-build-system)
    (propagated-inputs
      `(("libx11" ,libx11)
        ("libice" ,libice)
        ("libsm" ,libsm)))
    (inputs
      `(("xproto" ,xproto)
        ("libx11" ,libx11)
        ("kbproto" ,kbproto)
        ("pkg-config" ,pkg-config)))
    (home-page "http://www.x.org/wiki/")
    (synopsis "xorg implementation of the X Window System")
    (description "X.org provides an implementation of the X Window System")
    (license license:x11)))