* Backwards compatibility with old user environment manifests.

1 files changed, 6 insertions, 3 deletions

diff --git a/src/nix-env/main.cc b/src/nix-env/main.cc
index f67a07689..f2a995730 100644
--- a/src/nix-env/main.cc
+++ b/src/nix-env/main.cc
@@ -107,10 +107,11 @@ struct AddPos : TermFun
 {
     ATerm operator () (ATerm e)
     {
-        ATerm x, y, z;
-        if (matchBind(e, x, y, z)) return e;
-        if (matchBind2(e, x, y))
+        ATerm x, y;
+        if (matchObsoleteBind(e, x, y))
             return makeBind(x, y, makeNoPos());
+        if (matchObsoleteStr(e, x))
+            return makeStr(x, ATempty);
         return e;
     }
 };
@@ -921,6 +922,8 @@ static void opQuery(Globals & globals,
             else
                 table.push_back(columns);
 
+            cout.flush();
+
         } catch (AssertionError & e) {
             /* !!! hm, maybe we should give some sort of warning here? */
         }