maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix): getEnv(): Return std::optional

Browse source 
This allows distinguishing between an empty value and no value.

Patch ported from upstream at
ba87b08f85

Change-Id: I061cc8e16b1a7a0341adfc3b0edca1c0c51d5c97
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1884
Tested-by: BuildkiteCI
Reviewed-by: kanepyork <rikingcoding@gmail.com>
This commit is contained in:
Eelco Dolstra 2019-11-22 16:06:44 +01:00 • committed by glittershark
parent c5f3b12f04
commit 785cb3a754
17 changed files with 66 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

2
third_party/nix/src/nix-env/nix-env.cc vendored
View file

@ -1516,7 +1516,7 @@ static int _main(int argc, char** argv) {
globals.instSource.autoArgs = myArgs.getAutoArgs(*globals.state);
if (globals.profile.empty()) {
globals.profile = getEnv("NIX_PROFILE", "");
globals.profile = getEnv("NIX_PROFILE").value_or("");
}
if (globals.profile.empty()) {