From b34165054d98dbeee8615f29fc09c7796dc25571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 8 Feb 2010 15:33:18 +0000
Subject: [PATCH] Ratpoison: Fix glibc 2.11 builds.

svn path=/nixpkgs/trunk/; revision=19867
---
 .../window-managers/ratpoison/default.nix     | 53 ++++++++++++++++---
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix
index dcebc8d055a8..a13ceddbdbf3 100644
--- a/pkgs/applications/window-managers/ratpoison/default.nix
+++ b/pkgs/applications/window-managers/ratpoison/default.nix
@@ -1,14 +1,53 @@
-{stdenv, fetchurl, libX11, inputproto, libXt, libXpm, libXft, fontconfig,
-	libXtst, xextproto, readline, libXi}:
-stdenv.mkDerivation {
+{ stdenv, fetchurl, libX11, inputproto, libXt, libXpm, libXft, fontconfig
+, libXtst, xextproto, readline, libXi, pkgconfig, autoconf, automake }:
+
+stdenv.mkDerivation rec {
   name = "ratpoison-1.4.5";
 
   src = fetchurl {
-    url = http://download.savannah.gnu.org/releases/ratpoison/ratpoison-1.4.5.tar.gz;
+    url = "mirror://savannah/ratpoison/${name}.tar.gz";
     sha256 = "7391079db20b8613eecfd81d64d243edc9d3c586750c8f2da2bb9db14d260f03";
   };
 
-  buildInputs = [libX11 inputproto libXt
-	 libXpm libXft fontconfig libXtst
-	xextproto readline libXi];
+  patches =
+    [ (fetchurl {
+         url = "http://git.savannah.gnu.org/cgit/ratpoison.git/patch/?id=4ad0b38fb53506d613c4b4f7268dadfcedae9b8e";
+         sha256 = "09aa5l7qicld1prfsql6znlz3z8j67rlznw1vj7aja435rxm4lq9";
+       })
+    ];
+
+  preConfigure = "autoreconf -vf";
+
+  buildInputs =
+    [ libX11 inputproto libXt
+      libXpm libXft fontconfig libXtst
+      xextproto readline libXi pkgconfig
+      autoconf automake  # needed because of the patch above
+    ];
+
+  meta = {
+    description = "Ratpoison, a simple mouse-free tiling window manager";
+    longDescription =
+      '' Ratpoison is a simple window manager with no fat library
+         dependencies, no fancy graphics, no window decorations, and no
+         rodent dependence.  It is largely modelled after GNU Screen which
+         has done wonders in the virtual terminal market.
+
+         The screen can be split into non-overlapping frames.  All windows
+         are kept maximized inside their frames to take full advantage of
+         your precious screen real estate.
+
+         All interaction with the window manager is done through keystrokes.
+         Ratpoison has a prefix map to minimize the key clobbering that
+         cripples Emacs and other quality pieces of software.
+      '';
+
+    license = "GPLv2+";
+
+    homepage = http://www.nongnu.org/ratpoison/;
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
 }
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3bef2ccb7cc6..548b855e7a5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7811,7 +7811,7 @@ let
   };
 
   ratpoison = import ../applications/window-managers/ratpoison {
-    inherit fetchurl stdenv fontconfig readline;
+    inherit fetchurl stdenv fontconfig readline pkgconfig autoconf automake;
     inherit (xlibs) libX11 inputproto libXt libXpm libXft
       libXtst xextproto libXi;
   };