about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2005-02-17T15·48+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2005-02-17T15·48+0000
commit74ab0695b5bec5c7239744a89df5b2a7112e916b (patch)
treea55de905d5081084385b8d643a8e2c67894df656
parent8a3a96dd5b009d337c0cd12b58a41c943d0aa516 (diff)
* Compatibility hack with older user environments.
-rw-r--r--src/nix-env/main.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nix-env/main.cc b/src/nix-env/main.cc
index 6e4ba61e5982..71c22d1a51e0 100644
--- a/src/nix-env/main.cc
+++ b/src/nix-env/main.cc
@@ -197,7 +197,9 @@ static void createUserEnv(EvalState & state, const UserEnvElems & elems,
     PathSet drvsToBuild;
     for (UserEnvElems::const_iterator i = elems.begin(); 
          i != elems.end(); ++i)
-        if (i->second.drvPath != "")
+        /* Call to `isDerivation' is for compatibility with Nix <= 0.7
+           user environments. */
+        if (i->second.drvPath != "" && isDerivation(i->second.drvPath))
             drvsToBuild.insert(i->second.drvPath);
 
     debug(format("building user environment dependencies"));