forked from mirrors/nixpkgs
xorg: add libXpresent and xcb-util-errors
This commit is contained in:
parent
34c9d898da
commit
3287103b00
pkgs/servers/x11/xorg
|
@ -774,6 +774,16 @@ let
|
||||||
buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
|
buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
|
||||||
}) // {inherit libX11 libXext xextproto xproto libXt ;};
|
}) // {inherit libX11 libXext xextproto xproto libXt ;};
|
||||||
|
|
||||||
|
libXpresent = (mkDerivation "libXpresent" {
|
||||||
|
name = "libXpresent-1.0.0";
|
||||||
|
builder = ./builder.sh;
|
||||||
|
src = fetchurl {
|
||||||
|
url = mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2;
|
||||||
|
sha256 = "12kvvar3ihf6sw49h6ywfdiwmb8i1gh8wasg1zhzp6hs2hay06n1";
|
||||||
|
};
|
||||||
|
buildInputs = [pkgconfig presentproto libX11 xextproto xproto ];
|
||||||
|
}) // {inherit presentproto libX11 xextproto xproto ;};
|
||||||
|
|
||||||
libXrandr = (mkDerivation "libXrandr" {
|
libXrandr = (mkDerivation "libXrandr" {
|
||||||
name = "libXrandr-1.5.0";
|
name = "libXrandr-1.5.0";
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
|
@ -1204,6 +1214,16 @@ let
|
||||||
buildInputs = [pkgconfig gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ];
|
buildInputs = [pkgconfig gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ];
|
||||||
}) // {inherit gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ;};
|
}) // {inherit gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ;};
|
||||||
|
|
||||||
|
xcbutilerrors = (mkDerivation "xcbutilerrors" {
|
||||||
|
name = "xcb-util-errors-1.0";
|
||||||
|
builder = ./builder.sh;
|
||||||
|
src = fetchurl {
|
||||||
|
url = http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2;
|
||||||
|
sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8";
|
||||||
|
};
|
||||||
|
buildInputs = [pkgconfig gperf m4 libxcb xcbproto xproto ];
|
||||||
|
}) // {inherit gperf m4 libxcb xcbproto xproto ;};
|
||||||
|
|
||||||
xcbutilimage = (mkDerivation "xcbutilimage" {
|
xcbutilimage = (mkDerivation "xcbutilimage" {
|
||||||
name = "xcb-util-image-0.4.0";
|
name = "xcb-util-image-0.4.0";
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
|
|
|
@ -7,3 +7,4 @@ http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2
|
||||||
http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2
|
http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2
|
||||||
http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2
|
http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2
|
||||||
http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2
|
http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2
|
||||||
|
http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2
|
||||||
|
|
|
@ -173,6 +173,9 @@ in
|
||||||
patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in";
|
patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
libXpresent = attrs: attrs
|
||||||
|
// { buildInputs = with xorg; attrs.buildInputs ++ [ libXext libXfixes libXrandr ]; };
|
||||||
|
|
||||||
setxkbmap = attrs: attrs // {
|
setxkbmap = attrs: attrs // {
|
||||||
postInstall =
|
postInstall =
|
||||||
''
|
''
|
||||||
|
|
|
@ -75,6 +75,7 @@ mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
|
||||||
mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2
|
mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2
|
||||||
mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2
|
mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2
|
||||||
mirror://xorg/individual/lib/libXpm-3.5.11.tar.bz2
|
mirror://xorg/individual/lib/libXpm-3.5.11.tar.bz2
|
||||||
|
mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2
|
||||||
mirror://xorg/individual/lib/libXrandr-1.5.0.tar.bz2
|
mirror://xorg/individual/lib/libXrandr-1.5.0.tar.bz2
|
||||||
mirror://xorg/individual/lib/libXrender-0.9.8.tar.bz2
|
mirror://xorg/individual/lib/libXrender-0.9.8.tar.bz2
|
||||||
mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2
|
mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2
|
||||||
|
|
Loading…
Reference in a new issue