about summary refs log tree commit diff
path: root/src/nix-env/main.cc
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2006-12-02T16·41+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2006-12-02T16·41+0000
commite25fad691aa3ccb492c4fb8840289f76151e553e (patch)
tree1610455ac3d4d1d0b992f56e10825cf91e1445e5 /src/nix-env/main.cc
parent30bf547f4f5bc881eb60c9e11020d077fbb8b899 (diff)
* Move addTempRoot() to the store API, and add another function
  syncWithGC() to allow clients to register GC roots without needing
  write access to the global roots directory or the GC lock.

Diffstat (limited to 'src/nix-env/main.cc')
-rw-r--r--src/nix-env/main.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix-env/main.cc b/src/nix-env/main.cc
index 4f0b5eca9024..f2988485cdfd 100644
--- a/src/nix-env/main.cc
+++ b/src/nix-env/main.cc
@@ -182,7 +182,7 @@ static void createUserEnv(EvalState & state, const DrvInfos & elems,
 
         /* This is only necessary when installing store paths, e.g.,
            `nix-env -i /nix/store/abcd...-foo'. */
-        addTempRoot(i->queryOutPath(state));
+        store->addTempRoot(i->queryOutPath(state));
         store->ensurePath(i->queryOutPath(state));
         
         references.insert(i->queryOutPath(state));
@@ -940,7 +940,7 @@ static void opSwitchProfile(Globals & globals,
     if (opArgs.size() != 1)
         throw UsageError(format("exactly one argument expected"));
 
-    Path profile = opArgs.front();
+    Path profile = absPath(opArgs.front());
     Path profileLink = getHomeDir() + "/.nix-profile";
 
     switchLink(profileLink, profile);