From f32cdc4fab1bff919c3d074a95e32a9934eb7386 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 23 Oct 2017 19:34:49 +0200
Subject: Turn $NIX_REMOTE into a configuration option

---
 src/nix/command.cc | 5 +----
 src/nix/command.hh | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/nix')

diff --git a/src/nix/command.cc b/src/nix/command.cc
index 0f6bb294b38c..70d642605d88 100644
--- a/src/nix/command.cc
+++ b/src/nix/command.cc
@@ -78,9 +78,6 @@ bool MultiCommand::processArgs(const Strings & args, bool finish)
 
 StoreCommand::StoreCommand()
 {
-    storeUri = getEnv("NIX_REMOTE");
-
-    mkFlag(0, "store", "store-uri", "URI of the Nix store to use", &storeUri);
 }
 
 ref<Store> StoreCommand::getStore()
@@ -92,7 +89,7 @@ ref<Store> StoreCommand::getStore()
 
 ref<Store> StoreCommand::createStore()
 {
-    return openStore(storeUri);
+    return openStore();
 }
 
 void StoreCommand::run()
diff --git a/src/nix/command.hh b/src/nix/command.hh
index bf897f620db6..77ca8cfb64bf 100644
--- a/src/nix/command.hh
+++ b/src/nix/command.hh
@@ -33,7 +33,6 @@ class Store;
 /* A command that require a Nix store. */
 struct StoreCommand : virtual Command
 {
-    std::string storeUri;
     StoreCommand();
     void run() override;
     ref<Store> getStore();
-- 
cgit 1.4.1