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/libexpr/get-drvs.hh | |
| 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/libexpr/get-drvs.hh')
| -rw-r--r-- | src/libexpr/get-drvs.hh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libexpr/get-drvs.hh b/src/libexpr/get-drvs.hh index 82fb8a3ac..32294e458 100644 --- a/src/libexpr/get-drvs.hh +++ b/src/libexpr/get-drvs.hh @@ -75,10 +75,10 @@ typedef list<DrvInfo> DrvInfos; #endif -/* If value `v' denotes a derivation, store information about the - derivation in `drv' and return true. Otherwise, return false. */ -bool getDerivation(EvalState & state, Value & v, DrvInfo & drv, - bool ignoreAssertionFailures); +/* If value `v' denotes a derivation, return a DrvInfo object + describing it. Otherwise return nothing. */ +std::experimental::optional<DrvInfo> getDerivation(EvalState & state, + Value & v, bool ignoreAssertionFailures); void getDerivations(EvalState & state, Value & v, const string & pathPrefix, Bindings & autoArgs, DrvInfos & drvs, |