From 251d42d03f4856d6982291797a9710d0c6afef9a Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Sat, 31 Dec 2011 04:05:50 +0000
Subject: [PATCH] xcb-util-0.3.8 (+image|keysyms|renderutil|wm)
this might break things but makes awesome-3.4.11 happy
svn path=/nixpkgs/trunk/; revision=31171
---
pkgs/servers/x11/xorg/default.nix | 48 +++++++++++++++++++++++++++++--
1 file changed, 45 insertions(+), 3 deletions(-)
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index f25289a683a3..b1c7770b2bad 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1148,15 +1148,57 @@ let
})) // {inherit python ;};
xcbutil = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) {
- name = "xcb-util-0.3.6";
+ name = "xcb-util-0.3.8";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/xcb/xcb-util-0.3.6.tar.bz2;
- sha256 = "0mqfyq6skm19hhfmd5kmcn0v4di4pmbdszmbf2lmhn01mc8yxf7z";
+ url = mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2;
+ sha256 = "c1eed9284750bc09352e60654df77bb585dbbe7673fdcc675e58b7f3a0b447b9";
};
buildInputs = [pkgconfig gperf m4 libxcb xproto ];
})) // {inherit gperf m4 libxcb xproto ;};
+ xcbutilImage = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) {
+ name = "xcb-util-image-0.3.8";
+ builder = ./builder.sh;
+ src = fetchurl {
+ url = mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2;
+ sha256 = "40390528c26e8231132540f16579b821de68bb2e9152918f72182d5a4038a6d9";
+ };
+ buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ];
+ })) // {inherit gperf m4 libxcb xcbutil xproto ;};
+
+ # XXX: No package 'xorg-macros' found
+ xcbutilKeysyms = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) {
+ name = "xcb-util-keysyms-0.3.8";
+ builder = ./builder.sh;
+ src = fetchurl {
+ url = mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2;
+ sha256 = "913d32f7afe380c580da7636ee13f2728790237bb5c03def536363f552686121";
+ };
+ buildInputs = [pkgconfig gperf m4 libxcb xproto ];
+ })) // {inherit gperf m4 libxcb xproto ;};
+
+ # XXX: No package 'xorg-macros' found
+ xcbutilRenderutil = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) {
+ name = "xcb-util-renderutil-0.3.8";
+ builder = ./builder.sh;
+ src = fetchurl {
+ url = mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2;
+ sha256 = "9789a5c55728fa7bae374d9fdf1c61095869bdc68561911760879095644c7452";
+ };
+ buildInputs = [pkgconfig gperf m4 libxcb ];
+ })) // {inherit gperf m4 libxcb ;};
+
+ xcbutilWm = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) {
+ name = "xcb-util-wm-0.3.8";
+ builder = ./builder.sh;
+ src = fetchurl {
+ url = mirror://xorg/individual/xcb/xcb-util-wm-0.3.8.tar.bz2;
+ sha256 = "c557abbe4c7d45268f0541ee3d8f9a1a8799692fcc28aa33f39db93cc2e65007";
+ };
+ buildInputs = [pkgconfig gperf m4 libxcb ];
+ })) // {inherit gperf m4 libxcb ;};
+
xclock = (stdenv.mkDerivation ((if overrides ? xclock then overrides.xclock else x: x) {
name = "xclock-1.0.5";
builder = ./builder.sh;