From 9db243b4aa1ebd77fb9928e255133173bc716aae Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 4 Feb 2013 07:29:30 -0500 Subject: [PATCH] nixos-install: Respect host $NIX_CONF_DIR and don't assume nix.conf exists --- modules/installer/tools/nixos-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/installer/tools/nixos-install.sh b/modules/installer/tools/nixos-install.sh index 58fe3e32743..3cf919fc0ed 100644 --- a/modules/installer/tools/nixos-install.sh +++ b/modules/installer/tools/nixos-install.sh @@ -110,7 +110,7 @@ export LC_TIME= # Create a temporary Nix config file that causes the nixbld users to # be used. echo "build-users-group = nixbld" > $mountPoint/tmp/nix.conf -grep binary-caches /etc/nix/nix.conf >> $mountPoint/tmp/nix.conf +grep binary-caches "$NIX_CONF_DIR/nix.conf" >> $mountPoint/tmp/nix.conf || true export NIX_CONF_DIR=/tmp