From 1581e0c08ef6b704c6f3900d3d817ac88160f2c7 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 30 Aug 2005 11:23:56 +0000
Subject: [PATCH] remove dependency on /nix, so we can build NixOS inside NixOS

svn path=/nixu/trunk/; revision=3747
---
 make-disk.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make-disk.sh b/make-disk.sh
index c8dd31d3b0ae..55db5bc6b7d7 100755
--- a/make-disk.sh
+++ b/make-disk.sh
@@ -20,7 +20,7 @@ touch ${archivesDir}/blah
 chmod -f -R +w ${archivesDir}/*
 rm -rf ${archivesDir}/*
 
-NIX_CMD_PATH=/nix/bin
+NIX_CMD_PATH=$(dirname $(which nix-store))
 
 storeExpr=$($NIX_CMD_PATH/nix-store -qR $($NIX_CMD_PATH/nix-store -r $(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -)))
 #$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr) $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -))
@@ -216,7 +216,7 @@ cp -fau --parents ${coreUtilsDiet} ${initdir}
 cp -fau --parents ${e2fsProgs} ${initdir}
 cp -fau --parents ${modUtils} ${initdir}
 cp -fau --parents ${hotplug} ${initdir}
-cp -fau --parents ${which} ${initdir}
+#cp -fau --parents ${which} ${initdir}
 
 touch ${initdir}/NIXOS