From aec17bfbd380da05eb43b423041adc2b19a42914 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Sat, 8 Feb 2014 10:52:59 +0800
Subject: [PATCH 1/2] add guile-xcb 1.3

---
 .../guile-modules/guile-xcb/default.nix       | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/guile-modules/guile-xcb/default.nix

diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix
new file mode 100644
index 000000000000..a192025df697
--- /dev/null
+++ b/pkgs/development/guile-modules/guile-xcb/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, guile, texinfo }:
+
+stdenv.mkDerivation {
+  name = "guile-xcb-1.3";
+
+  meta = with stdenv.lib; {
+    description = "XCB bindings for Guile";
+    homepage    = "http://www.markwitmer.com/guile-xcb/guile-xcb.html";
+    license     = licenses.gpl3Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ iyzsong ];
+  };
+
+  src = fetchurl {
+    name = "guile-xcb-1.3.tar.gz";
+    sha256 = "1gna9h3536s880p4bd9n2jyh2a8igwya6x7v3vfx19f4rppmai60";
+
+    urls = [
+     "http://www.markwitmer.com/dist/guile-xcb-1.3.tar.gz"
+     "https://github.com/mwitmer/guile-xcb/archive/1.3.tar.gz"
+    ];
+  };
+
+  buildInputs = [ pkgconfig guile texinfo ];
+
+  preConfigure = ''
+    configureFlags="
+      --with-guile-site-dir=$out/share/guile/site
+      --with-guile-site-ccache-dir=$out/share/guile/site
+    ";
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3478b409d10d..2c68e9bc193b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3367,6 +3367,8 @@ let
 
   guile_ncurses = callPackage ../development/guile-modules/guile-ncurses { };
 
+  guile-xcb = callPackage ../development/guile-modules/guile-xcb { };
+
   srecord = callPackage ../development/tools/misc/srecord { };
 
   windowssdk = (

From 561378ad030ef911b1aadf63678a21444a127e9a Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Mon, 17 Feb 2014 09:48:34 +0800
Subject: [PATCH 2/2] guile-xcb: fix hash

---
 pkgs/development/guile-modules/guile-xcb/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix
index a192025df697..fc02ab305a38 100644
--- a/pkgs/development/guile-modules/guile-xcb/default.nix
+++ b/pkgs/development/guile-modules/guile-xcb/default.nix
@@ -12,13 +12,8 @@ stdenv.mkDerivation {
   };
 
   src = fetchurl {
-    name = "guile-xcb-1.3.tar.gz";
-    sha256 = "1gna9h3536s880p4bd9n2jyh2a8igwya6x7v3vfx19f4rppmai60";
-
-    urls = [
-     "http://www.markwitmer.com/dist/guile-xcb-1.3.tar.gz"
-     "https://github.com/mwitmer/guile-xcb/archive/1.3.tar.gz"
-    ];
+    url = "http://www.markwitmer.com/dist/guile-xcb-1.3.tar.gz";
+    sha256 = "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149";
   };
 
   buildInputs = [ pkgconfig guile texinfo ];