diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libexpr/primops.cc | 13 | ||||
| -rw-r--r-- | src/nix-env/main.cc | 7 |
2 files changed, 2 insertions, 18 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index d82cc5870a3a..50712a72513a 100644 --- a/src/libexpr/primops.cc +++ b/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)) { diff --git a/src/nix-env/main.cc b/src/nix-env/main.cc index 284730c04293..b3caaeac8277 100644 --- a/src/nix-env/main.cc +++ b/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. */ |