diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 51522b4bc4..14f19938dc 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -24,7 +24,6 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages bison) #:use-module (gnu packages compression) - #:use-module (gnu packages bison) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) #:use-module ((gnu packages gettext) @@ -1474,35 +1473,6 @@ and Matrox.") (license license:x11))) -(define-public libxdamage - (package - (name "libxdamage") - (version "1.1.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/X11R7.7/src/everything/libXdamage-" - version - ".tar.bz2")) - (sha256 - (base32 - "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw")))) - (build-system gnu-build-system) - (inputs - `(("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 libxdmcp (package (name "libxdmcp") @@ -4162,6 +4132,36 @@ and Matrox.") (license license:x11))) +(define-public libxdamage + (package + (name "libxdamage") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/X11R7.7/src/everything/libXdamage-" + version + ".tar.bz2")) + (sha256 + (base32 + "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw")))) + (build-system gnu-build-system) + (propagated-inputs + `(("damageproto" ,damageproto))) + (inputs + `(("xproto" ,xproto) + ("libxfixes" ,libxfixes) + ("xextproto" ,xextproto) + ("libx11" ,libx11) + ("fixesproto" ,fixesproto) + ("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")