* Remove those storePath attribute sets, we don't need 'em.

src/libexpr/primops.cc

@@ -170,18 +170,7 @@ static void processBinding(EvalState & state, Expr e, Derivation & drv,
             ss.push_back(outPath);
         }
 
-        else if (a && evalString(state, a) == "storePath") {
-
-            a = queryAttr(e, "outPath");
-            if (!a) throw EvalError("output path missing");
-            /* !!! supports only single output path */
-            Path outPath = evalPath(state, a);
-
-            drv.inputSrcs.insert(outPath);
-            ss.push_back(outPath);
-        }
-
-        else throw TypeError("attribute sets in derivations must either be derivations or store paths");
+        else throw TypeError("attribute sets in derivations must be derivations");
     }
 
     else if (matchPath(e, s)) {

src/nix-env/main.cc

@@ -192,12 +192,7 @@ static void createUserEnv(EvalState & state, const DrvInfos & elems,
         makeBind(toATerm("derivations"),
             makeList(ATreverse(inputs)), makeNoPos()),
         makeBind(toATerm("manifest"),
-            makeAttrs(ATmakeList2(
-                makeBind(toATerm("type"),
-                    makeStr(toATerm("storePath")), makeNoPos()),
-                makeBind(toATerm("outPath"),
-                    makePath(toATerm(manifestFile)), makeNoPos())
-                )), makeNoPos())
+            makePath(toATerm(manifestFile)), makeNoPos())
         )));
 
     /* Instantiate it. */