GNU Hurd: Restructure for easier overriding, and easier avoided rebuilds.

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

1 files changed, 15 insertions, 5 deletions

diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix
index ca1c71053e5d..e37867e3bef5 100644
--- a/pkgs/os-specific/gnu/hurd/default.nix
+++ b/pkgs/os-specific/gnu/hurd/default.nix
@@ -40,18 +40,17 @@ stdenv.mkDerivation ({
         then [ "--with-parted" ]
         else [ "--without-parted" ]);
 
-  preConfigure = "autoreconf -vfi";
+  preConfigure =
+    '' autoreconf -vfi
 
-  patchPhase =
-    '' echo "removing \`-o root' from makefiles..."
+       echo "removing \`-o root' from makefiles..."
        for mf in {utils,daemons}/Makefile
        do
          sed -i "$mf" -e's/-o root//g'
        done
     '';
 
-  buildPhase = "make ${buildTarget}";
-  installPhase = "make ${installTarget}";
+  crossAttrs.dontPatchShebangs = true;
 
   meta = {
     description = "The GNU Hurd, GNU project's replacement for the Unix kernel";
@@ -74,6 +73,17 @@ stdenv.mkDerivation ({
 
 //
 
+(if !headersOnly && buildTarget != null
+ then assert installTarget != null; {
+   # Use the default `buildPhase' and `installPhase' so that the usual hooks
+   # can still be used.
+   buildFlags = buildTarget;
+   installTargets = installTarget;
+ }
+ else {})
+
+//
+
 (if headersOnly
  then { buildPhase = ":"; installPhase = "make install-headers"; }
  else (if (cross != null)