* 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/development/compilers/ghc-6.8/default.nix

@@ -21,14 +21,6 @@ stdenv.mkDerivation (rec {
     description = "The Glasgow Haskell Compiler";
   };
 
-  postInstall = ''
-    ensureDir "$out/nix-support"
-    echo "# Path to the GHC compiler directory in the store" > $out/nix-support/setup-hook
-    echo "ghc=$out" >> $out/nix-support/setup-hook
-    echo ""         >> $out/nix-support/setup-hook
-    cat $setupHook  >> $out/nix-support/setup-hook
-  '';
-
   configureFlags=[
     "--with-gmp-libraries=${gmp}/lib"
     "--with-readline-libraries=${readline}/lib"

pkgs/development/compilers/ghc-6.8/setup-hook.sh

@@ -4,7 +4,7 @@ mkdir -p $ghc_support
 
 # Create isolated package config
 packages_db=$ghc_support/package.conf
-cp $ghc/lib/ghc-*/package.conf $packages_db
+cp @out@/lib/ghc-*/package.conf $packages_db
 chmod +w $packages_db
 
 # Generate wrappers for GHC that use the isolated package config