From 4e0ccd63b3ec8fa1b933ab9ffae97fb0316af98d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Feb 2010 14:27:26 +0000
Subject: [PATCH] * In NixOS chroot builds, there is no root account.  So rcs'
 configure   should not rely on its existence in deciding whether to use  
 getpwuid().  Not using getpwuid() causes rcs to fail with "ci:   setuid not
 supported".

svn path=/nixpkgs/trunk/; revision=19957
---
 .../version-management/rcs/default.nix        | 10 ++++++++
 .../version-management/rcs/no-root.patch      | 23 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/version-management/rcs/no-root.patch

diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix
index 6fb111c47a3..6efd5ddee9e 100644
--- a/pkgs/applications/version-management/rcs/default.nix
+++ b/pkgs/applications/version-management/rcs/default.nix
@@ -2,8 +2,18 @@
 
 stdenv.mkDerivation {
   name = "rcs-5.7";
+  
   src = fetchurl {
     url = ftp://ftp.cs.purdue.edu/pub/RCS/rcs-5.7.tar;
     md5 = "f7b3f106bf87ff6344df38490f6a02c5";
   };
+
+  patches = [ ./no-root.patch ];
+
+  meta = {
+    homepage = http://www.cs.purdue.edu/homes/trinkle/RCS/;
+    description = "Revision Control System, a version management system";
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = [ stdenv.lib.platforms.all ];
+  };
 }
diff --git a/pkgs/applications/version-management/rcs/no-root.patch b/pkgs/applications/version-management/rcs/no-root.patch
new file mode 100644
index 00000000000..2fbfc86ff45
--- /dev/null
+++ b/pkgs/applications/version-management/rcs/no-root.patch
@@ -0,0 +1,23 @@
+In NixOS chroot builds, there is no root account.  So configure should
+not rely on its existence in deciding whether to use getpwuid().
+
+diff -rc -x '*~' rcs-5.7-orig/src/conf.sh rcs-5.7/src/conf.sh
+*** rcs-5.7-orig/src/conf.sh	1995-06-16 08:19:24.000000000 +0200
+--- rcs-5.7/src/conf.sh	2010-02-12 15:22:37.000000000 +0100
+***************
+*** 821,827 ****
+  	a= z=
+  	cat >a.c <<EOF
+  #include "$A_H"
+! int main() { exitmain(!getpwuid(0)); }
+  EOF
+  	$PREPARE_CC || exit
+  	if ($CL a.c $L && $aout) >&2
+--- 821,827 ----
+  	a= z=
+  	cat >a.c <<EOF
+  #include "$A_H"
+! int main() { exitmain(!getpwuid(getuid())); }
+  EOF
+  	$PREPARE_CC || exit
+  	if ($CL a.c $L && $aout) >&2