* substitute: support patterns starting with a dash.

* Updated the kernel headers.
* ghc: setup hooks are now generated using substituteAll.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10838

pkgs/tools/text/gnugrep/default.nix

@@ -1,6 +1,6 @@
 {stdenv, fetchurl, pcre}:
 
-stdenv.mkDerivation ({
+stdenv.mkDerivation {
   name = "gnugrep-2.5.3";
   
   src = fetchurl {
@@ -10,12 +10,12 @@ stdenv.mkDerivation ({
   
   buildInputs = [pcre];
 
+  preBuild = ''
+    makeFlagsArray=(mkdir_p="mkdir -p")
+  '';
+  
   meta = {
     homepage = http://www.gnu.org/software/grep/;
     description = "GNU implementation of the Unix grep command";
   };
-} // (if stdenv.system == "i686-darwin" then {
-  preBuild = ''
-    makeFlagsArray=(mkdir_p="mkdir -p")
-  '';
-} else {}))
+}