diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2017-07-20 13:32:01 +0200 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2017-07-20 13:50:25 +0200 |
commit | c94f3d5575d7af5403274d1e9e2f3c9d72989751 (patch) | |
tree | d6a302d585ed8f38a8a8d959b74bee44b7d77370 /src/nix | |
parent | 57a30e101b36a064f09619bf4a3f0b8a3fdcdcad (diff) |
nix-shell: Use bashInteractive from <nixpkgs>
This adds about 0.1s to nix-shell runtime in the case where
bashInteractive already exists.
See discussion at https://github.com/NixOS/nixpkgs/issues/27493.
Diffstat (limited to 'src/nix')
-rw-r--r-- | src/nix/repl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nix/repl.cc b/src/nix/repl.cc index 437c7903e..7d5b8f466 100644 --- a/src/nix/repl.cc +++ b/src/nix/repl.cc @@ -292,10 +292,10 @@ bool isVarName(const string & s) Path NixRepl::getDerivationPath(Value & v) { - DrvInfo drvInfo(state); - if (!getDerivation(state, v, drvInfo, false)) + auto drvInfo = getDerivation(state, v, false); + if (!drvInfo) throw Error("expression does not evaluate to a derivation, so I can't build it"); - Path drvPath = drvInfo.queryDrvPath(); + Path drvPath = drvInfo->queryDrvPath(); if (drvPath == "" || !state.store->isValidPath(drvPath)) throw Error("expression did not evaluate to a valid derivation"); return drvPath; |