* 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

2 files changed, 10 insertions, 8 deletions

diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index b0a95beb56ca..fcb45f2cb3de 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/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 {}))
\ No newline at end of file
+}
diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix
index 85e2fe2caca3..7ac41bbe8bf2 100644
--- a/pkgs/tools/text/replace/default.nix
+++ b/pkgs/tools/text/replace/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation ({
+stdenv.mkDerivation {
   name = "replace-2.24";
 
   src = fetchurl {
@@ -12,8 +12,10 @@ stdenv.mkDerivation ({
 
   postInstall = "mv \$out/bin/replace \$out/bin/replace-literal";
 
+  patches = [./malloc.patch];
+
   meta = {
     homepage = http://replace.richardlloyd.org.uk/;
     description = "A tool to replace verbatim strings";
   };
-} // (if stdenv.system == "i686-darwin" then {patches = [./malloc.patch];} else {}))
+}