summary refs log tree commit diff
path: root/pkgs/applications/window-managers/ratpoison
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-01-13 17:01:52 +0100
committerPeter Simons <simons@cryp.to>2014-01-13 17:05:45 +0100
commit5ef34645f37f714734cee791b69ac0793bd559d6 (patch)
treece61b00ac16a037b5c6bbdd66d9189fe731897aa /pkgs/applications/window-managers/ratpoison
parent088b35edfbdd664567a6041e5c18ef336f842439 (diff)
downloadnixpkgs-5ef34645f37f714734cee791b69ac0793bd559d6.tar
nixpkgs-5ef34645f37f714734cee791b69ac0793bd559d6.tar.gz
nixpkgs-5ef34645f37f714734cee791b69ac0793bd559d6.tar.bz2
nixpkgs-5ef34645f37f714734cee791b69ac0793bd559d6.tar.lz
nixpkgs-5ef34645f37f714734cee791b69ac0793bd559d6.tar.xz
nixpkgs-5ef34645f37f714734cee791b69ac0793bd559d6.tar.zst
nixpkgs-5ef34645f37f714734cee791b69ac0793bd559d6.zip
ratpoison: update to version 1.4.6
Diffstat (limited to 'pkgs/applications/window-managers/ratpoison')
-rw-r--r--pkgs/applications/window-managers/ratpoison/default.nix10
-rw-r--r--pkgs/applications/window-managers/ratpoison/glibc-fix.patch22
2 files changed, 4 insertions, 28 deletions
diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix
index 27266653302..d1419fc2225 100644
--- a/pkgs/applications/window-managers/ratpoison/default.nix
+++ b/pkgs/applications/window-managers/ratpoison/default.nix
@@ -2,11 +2,11 @@
 , libXtst, xextproto, readline, libXi, pkgconfig, perl, autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  name = "ratpoison-1.4.5";
+  name = "ratpoison-1.4.6";
 
   src = fetchurl {
     url = "mirror://savannah/ratpoison/${name}.tar.gz";
-    sha256 = "7391079db20b8613eecfd81d64d243edc9d3c586750c8f2da2bb9db14d260f03";
+    sha256 = "1y1b38bng0naxfy50asshzg5xr1b2rn88mcgbds42y72d7y9d0za";
   };
 
   buildInputs =
@@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
 
   preConfigure = "autoreconf -vf";      # needed because of the patch above
 
-  patches = [ ./glibc-fix.patch ];
-
   postInstall = ''
     mkdir -p $out/share/emacs/site-lisp
     mv "$out/share/ratpoison/"*.el $out/share/emacs/site-lisp/
@@ -45,7 +43,7 @@ stdenv.mkDerivation rec {
        cripples Emacs and other quality pieces of software.
     '';
 
-    maintainers = [ stdenv.lib.maintainers.simons ];
-    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = stdenv.lib.platforms.linux;
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/window-managers/ratpoison/glibc-fix.patch b/pkgs/applications/window-managers/ratpoison/glibc-fix.patch
deleted file mode 100644
index c779d5af795..00000000000
--- a/pkgs/applications/window-managers/ratpoison/glibc-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 4ad0b38fb53506d613c4b4f7268dadfcedae9b8e Mon Sep 17 00:00:00 2001
-From: Shawn Betts <sabetts@gmail.com>
-Date: Mon, 13 Jul 2009 01:23:25 +0000
-Subject: check for getline in configure.in
-
-This fixes a build error encountered on glibc 2.10 systems
----
-diff --git a/configure.in b/configure.in
-index 0c1b42c..08f4ee8 100644
---- a/configure.in
-+++ b/configure.in
-@@ -146,7 +146,7 @@ AC_CHECK_HEADERS(unistd.h stdarg.h)
- dnl Checks for typedefs, structures, and compiler characteristics.
- 
- dnl Checks for library functions.
--AC_CHECK_FUNCS(getopt getopt_long setsid setpgid setpgrp putenv vsnprintf usleep)
-+AC_CHECK_FUNCS(getopt getopt_long setsid setpgid setpgrp putenv vsnprintf usleep getline)
- 
- AC_TYPE_SIGNAL
- 
---
-cgit v0.9.0.2