From 95fa5b81b13dc6bd61b24aec180dbcff33854b26 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sun, 9 Jul 2006 22:33:01 +0000 Subject: [PATCH] remove a dependency on an external coreutils (overlooked) svn path=/nixu/trunk/; revision=5669 --- make-disk.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/make-disk.sh b/make-disk.sh index 7311499b1e24..10289da00420 100755 --- a/make-disk.sh +++ b/make-disk.sh @@ -3,8 +3,13 @@ # deps is an array declare -a deps +NIXSTORE=`which nix-store` +NIXINSTANTIATE=`which nix-instantiate` + +coreutils=$($NIXSTORE -r $(echo '(import ./pkgs.nix).coreutils' | $NIXINSTANTIATE -)) + # determine where we can find the Nix binaries -NIX=$(dirname $(which nix-store)) +NIX=$($coreutils/bin/dirname $(which nix-store)) # make sure we use many of our own tools, because it is more pure mktemp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mktemp' | $NIX/nix-instantiate -)) @@ -12,7 +17,6 @@ mktemp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mktemp' | $NIX/nix-instan gnused=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnused' | $NIX/nix-instantiate -)) gnutar=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnutar' | $NIX/nix-instantiate -)) cdrtools=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cdrtools' | $NIX/nix-instantiate -)) -coreutils=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).coreutils' | $NIX/nix-instantiate -)) gzip=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gzip' | $NIX/nix-instantiate -)) cpio=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).cpio' | $NIX/nix-instantiate -))