From 86173ade50c313eeeae4c687c308633ca0f2751c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 27 Aug 2008 14:48:28 +0000
Subject: [PATCH] * Rogue 5.4.4.

svn path=/nixpkgs/trunk/; revision=12745
---
 pkgs/games/rogue/default.nix    | 24 ++++++++++--------------
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix
index 569c287c051..16fb621d01d 100644
--- a/pkgs/games/rogue/default.nix
+++ b/pkgs/games/rogue/default.nix
@@ -1,21 +1,17 @@
 {stdenv, fetchurl, ncurses}:
 
 stdenv.mkDerivation {
-  name = "rogue-5.4.2";
+  name = "rogue-5.4.4";
+  
   src = fetchurl {
-    url = http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.2-src.tar.gz;
-    md5 = "bd656cb017a579eba835a0ee445a0a32";
+    url = http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz;
+    sha256 = "18g81274d0f7sr04p7h7irz0d53j6kd9j1y3zbka1gcqq0gscdvx";
   };
-  setSourceRoot = "sourceRoot=.";
+  
   buildInputs = [ncurses];
-  preBuild = "
-    ln -s ${ncurses}/include ncurses
-    substituteInPlace Makefile --replace curses ncurses
-  ";
-  installPhase = "
-    ensureDir $out/bin
-    cp rogue54 $out/bin
-    ln -s rogue54 $out/bin/rogue
-  ";
-  NIX_CFLAGS_COMPILE = "-I.";
+  
+  meta = {
+    homepage = http://rogue.rogueforge.net/rogue-5-4/;
+    description = "The final version of the original Rogue game developed for the UNIX operating system";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d26b99563e8..756039d723b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -130,6 +130,8 @@ let
   #   };
   overrideSetup = stdenv: setup: stdenv.regenerate setup;
 
+  stdenvNew = overrideSetup stdenv ../stdenv/generic/setup-new.sh;
+
   # Return a modified stdenv that uses dietlibc to create small
   # statically linked binaries.
   useDietLibC = stdenv: stdenv //