diff options
author | tv <tv@shackspace.de> | 2015-06-24 20:10:41 +0200 |
---|---|---|
committer | tv <tv@shackspace.de> | 2015-06-24 20:11:02 +0200 |
commit | d4ca5907d67c4f2374b6231ff03d8ed36b39ec96 (patch) | |
tree | adaaca4d329501aeafb20d6cec6afaf81d0bdfe1 /bin/nixos-build | |
parent | 0fa8921e803876d85e1a0d49d925c2919714ee56 (diff) |
s/nixos-fetch-git/fetchgit/
Diffstat (limited to 'bin/nixos-build')
-rwxr-xr-x | bin/nixos-build | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/bin/nixos-build b/bin/nixos-build index 79b052654..94f3dc1f4 100755 --- a/bin/nixos-build +++ b/bin/nixos-build @@ -14,7 +14,18 @@ nixos_config=$config_root/modules/$host secrets_nix=$secrets_root/$host/nix secrets_rsync=$secrets_root/$host/rsync -nixos-fetch-git "$host" +( + # Notice NIX_PATH used from host + # Notice secrets required to evaluate configuration + NIX_PATH=$NIX_PATH:nixos-config=$nixos_config + NIX_PATH=$NIX_PATH:secrets=$secrets_nix + export NIX_PATH + + rev=$(new-nixos-query nixpkgs.rev) + url=$(new-nixos-query nixpkgs.url) + + fetchgit "$rev" "$url" tmp/nixpkgs/$host +) nix-build \ -I "$nixpkgs" \ |