From d4ca5907d67c4f2374b6231ff03d8ed36b39ec96 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Wed, 24 Jun 2015 20:10:41 +0200
Subject: s/nixos-fetch-git/fetchgit/

---
 bin/nixos-build | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'bin/nixos-build')

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" \
-- 
cgit v1.2.3