diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-08-08 15:49:13 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-08-08 15:49:13 +0200 |
| commit | 1d750e058738f92b378a6bfbdadb025d1463c243 (patch) | |
| tree | 798ac85630df11dac35884c7c6c5bdd6be376bea /src/libutil/util.hh | |
| parent | 336afe4d5fe374569c2b13d2db90caac663573b3 (diff) | |
| parent | 05a10dd835923092b54fcad2276d54bf164c1b7f (diff) | |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'src/libutil/util.hh')
| -rw-r--r-- | src/libutil/util.hh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libutil/util.hh b/src/libutil/util.hh index e05ef1e7d..1f3d1e2ae 100644 --- a/src/libutil/util.hh +++ b/src/libutil/util.hh @@ -276,12 +276,14 @@ struct RunOptions std::optional<uid_t> uid; std::optional<uid_t> gid; std::optional<Path> chdir; + std::optional<std::map<std::string, std::string>> environment; Path program; bool searchPath = true; Strings args; std::optional<std::string> input; Source * standardIn = nullptr; Sink * standardOut = nullptr; + bool mergeStderrToStdout = false; bool _killStderr = false; RunOptions(const Path & program, const Strings & args) |