Author: ludo
Date: Wed Apr 18 17:22:10 2012
New Revision: 33834
URL: https://nixos.org/websvn/nix/?rev=33834&sc=1
Log:
GNU Hurd: Restructure for easier overriding, and easier avoided rebuilds.
Modified:
nixpkgs/trunk/pkgs/os-specific/gnu/hurd/default.nix
Modified: nixpkgs/trunk/pkgs/os-specific/gnu/hurd/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/gnu/hurd/default.nix Wed Apr 18 17:22:04
2012 (r33833)
+++ nixpkgs/trunk/pkgs/os-specific/gnu/hurd/default.nix Wed Apr 18 17:22:10
2012 (r33834)
@@ -40,18 +40,17 @@
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 @@
//
+(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)
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
