diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2019-05-08 13:46:44 +0200 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2019-05-08 13:46:44 +0200 |
commit | 2fc8a29a9cb4a47edc8132ab3e91ec4fbcb32ac1 (patch) | |
tree | 5e0fc52bba5705c358cf5c5750c8f9404f80d676 /src/libstore/build.cc | |
parent | 77e1f9010c5328bee16d85661fe359746cb70e40 (diff) | |
parent | 7ba0f98e644c31ce0c16db10aa87f896937e0ddf (diff) |
Merge remote-tracking branch 'tweag/nix-shell' into flakes
Diffstat (limited to 'src/libstore/build.cc')
-rw-r--r-- | src/libstore/build.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 53a0c743b..9730c75e2 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -1805,7 +1805,7 @@ void DerivationGoal::startBuilder() concatStringsSep(", ", parsedDrv->getRequiredSystemFeatures()), drvPath, settings.thisSystem, - concatStringsSep(", ", settings.systemFeatures)); + concatStringsSep<StringSet>(", ", settings.systemFeatures)); if (drv->isBuiltin()) preloadNSS(); |