* bash 2.0, findutils 4.2.28.

* Some Nix expression simplifications.  Sense and simplicity!

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

pkgs/tools/text/gnupatch/default.nix

@@ -1,19 +1,15 @@
-{stdenv, fetchurl}: stdenv.mkDerivation ({
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
   name = "gnupatch-2.5.4";
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/patch-2.5.4.tar.gz;
     md5 = "ee5ae84d115f051d87fcaaef3b4ae782";
   };
-} // 
-  # !!! hack
-  (if stdenv.system != "i686-linux" then {
-    patches = [./setmode.patch];
-    configureFlags = "dummy"; # doesn't build on Darwin unless a platform is specified
-  } else {})
-  // 
-  # !!! hack
-  (if stdenv ? isDietLibC then {
-    # !!! pass this on all platforms
-    configureFlags = "dummy"; # doesn't build unless a platform is specified
-  } else {})
-)
+
+  # Hack around ancient configure script: doesn't build on many newer
+  # platforms unless a platform is specified.
+  configureFlags = "dummy";
+  
+  patches = if stdenv.isDarwin then [./setmode.patch] else [];
+}