aboutsummaryrefslogtreecommitdiff
path: root/src/nix-instantiate
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-05-05 17:09:42 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-05-05 17:09:42 +0200
commit9451ef3731904090d7c8476137960a3fb9d4679d (patch)
treee1963c47fbba25a17f5a72670d774d28db229f1a /src/nix-instantiate
parent35d30d67ebcca90c3120eeaa7f38baee8805c670 (diff)
Allow URLs in the Nix search path
E.g. to install "hello" from the latest Nixpkgs: $ nix-build '<nixpkgs>' -A hello -I nixpkgs=https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz Or to install a specific version of NixOS: $ nixos-rebuild switch -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/63def04891a0abc328b1b0b3a78ec02c58f48583.tar.gz
Diffstat (limited to 'src/nix-instantiate')
-rw-r--r--src/nix-instantiate/nix-instantiate.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc
index 5abaa617d..973a34ec1 100644
--- a/src/nix-instantiate/nix-instantiate.cc
+++ b/src/nix-instantiate/nix-instantiate.cc
@@ -155,14 +155,16 @@ int main(int argc, char * * argv)
return true;
});
+ if (evalOnly && !wantsReadWrite)
+ settings.readOnlyMode = true;
+
+ store = openStore();
+
EvalState state(searchPath);
state.repair = repair;
Bindings & autoArgs(*evalAutoArgs(state, autoArgs_));
- if (evalOnly && !wantsReadWrite)
- settings.readOnlyMode = true;
-
if (attrPaths.empty()) attrPaths.push_back("");
if (findFile) {
@@ -174,8 +176,6 @@ int main(int argc, char * * argv)
return;
}
- store = openStore();
-
if (readStdin) {
Expr * e = parseStdin(state);
processExpr(state, attrPaths, parseOnly, strict, autoArgs,