* More cleanup.

svn path=/nixpkgs/trunk/; revision=22795

2 files changed, 26 insertions, 24 deletions

diff --git a/pkgs/games/micropolis/default.nix b/pkgs/games/micropolis/default.nix
index 4adbe69f697f..0dc156ca3b7a 100644
--- a/pkgs/games/micropolis/default.nix
+++ b/pkgs/games/micropolis/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, libX11, libXpm, libXext, xextproto, byacc }:
+
 stdenv.mkDerivation {
   name = "micropolis";
 
@@ -7,24 +8,25 @@ stdenv.mkDerivation {
     sha256 = "1b3c72dc3680a34b5fc5a740a6fb5cfc0b8775514da8ab7bb3b2965b20d4f8bc";
   };
 
-  patches = [
-    (fetchurl {
-      url = http://rmdir.de/~michael/micropolis_git.patch;
-      sha256 = "13419a4394242cd11d5cabd8b1b50787282ea16b55fdcfbeadf8505af46b0592";
-    })
-  ];
+  patches =
+    [ (fetchurl {
+        url = http://rmdir.de/~michael/micropolis_git.patch;
+        sha256 = "13419a4394242cd11d5cabd8b1b50787282ea16b55fdcfbeadf8505af46b0592";
+      })
+    ];
 
   buildInputs = [ libX11 libXpm libXext xextproto byacc ];
 
-  preConfigure = [
-    ''cd src
+  preConfigure =
+    ''
+      cd src
       sed -i "s@^CFLAGS.*\$@&\nCFLAGS += -I${libXpm}/include/X11@" tk/makefile
       sed -i "s@^INCLUDES.*\$@&\n\t-I$PWD/tcl \\\\@" sim/makefile
-    ''
-  ];
+    '';
 
-  postInstall = [ 
-    ''mkdir -p $out/bin
+  postInstall =
+    ''
+      mkdir -p $out/bin
       mkdir -p $out/usr/share/games/micropolis
       cd ..
       for d in activity cities images manual res; do
@@ -32,17 +34,16 @@ stdenv.mkDerivation {
       done
       cp Micropolis $out/usr/share/games/micropolis
       cat > $out/bin/micropolis << EOF 
-#!/bin/bash
-cd $out/usr/share/games/micropolis
-./Micropolis
-EOF
+      #!/bin/bash
+      cd $out/usr/share/games/micropolis
+      ./Micropolis
+      EOF
       chmod 755 $out/bin/micropolis
-    ''
-  ];
+    '';
 
   meta = { 
-      description = "GPL'ed version of S*m C*ty";
-      homepage = http://www.donhopkins.com/home/micropolis/;
-      license = "GPL";
+    description = "GPL'ed version of S*m C*ty";
+    homepage = http://www.donhopkins.com/home/micropolis/;
+    license = "GPL";
   };
 }
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 54f70f489796..5433c0018a5d 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, pango
+, gettext, zlib, boost, freetype, libpng, pkgconfig }:
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
@@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1mrhgwp8iw27ifpavnf4y69zf9fqfy7j4sfwkfzsay226sp4gw3y";
   };
 
-  buildInputs = [SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost freetype libpng pkgconfig];
+  buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib boost freetype libpng pkgconfig ];
 
   configureFlags = "--with-preferences-dir=.${name} --program-suffix=-${version} --with-datadir-name=${name} --with-boost=${boost}/include --disable-python";