diff options
| author | Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com> | 2022-03-01 13:58:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-01 13:58:17 +0100 |
| commit | 47dec825c5daeeb9d615eb4d1eead3dbaa06c7c9 (patch) | |
| tree | 9d4426dfe847570906487649c32c5b320697705c /src/libstore/builtins/buildenv.cc | |
| parent | 79152e307e7eef667c3de9c21571d017654a7c32 (diff) | |
| parent | dc92b01885c0c49d094148b1c4dc871ccdd265ad (diff) | |
Merge pull request #6181 from obsidiansystems/auto-uid-allocation
Auto uid allocation -- update with latest master
Diffstat (limited to 'src/libstore/builtins/buildenv.cc')
| -rw-r--r-- | src/libstore/builtins/buildenv.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/builtins/buildenv.cc b/src/libstore/builtins/buildenv.cc index e88fc687a..25d015cb9 100644 --- a/src/libstore/builtins/buildenv.cc +++ b/src/libstore/builtins/buildenv.cc @@ -123,7 +123,7 @@ void buildProfile(const Path & out, Packages && pkgs) createLinks(state, pkgDir, out, priority); try { - for (const auto & p : tokenizeString<std::vector<string>>( + for (const auto & p : tokenizeString<std::vector<std::string>>( readFile(pkgDir + "/nix-support/propagated-user-env-packages"), " \n")) if (!done.count(p)) postponed.insert(p); @@ -161,7 +161,7 @@ void buildProfile(const Path & out, Packages && pkgs) void builtinBuildenv(const BasicDerivation & drv) { - auto getAttr = [&](const string & name) { + auto getAttr = [&](const std::string & name) { auto i = drv.env.find(name); if (i == drv.env.end()) throw Error("attribute '%s' missing", name); return i->second; |