diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2020-06-17 10:26:52 +0200 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2020-06-17 10:26:52 +0200 |
commit | 1524752c17ee8753467f068c23fbe1d994aa8f75 (patch) | |
tree | c802ca482e2461765dcbdcef5cc6fa38c9d1c42b /src/nix/flake.cc | |
parent | 7db879e65e83b1c65206b490d36a69e97c5a877a (diff) | |
parent | 29542865cee37ab22efe1bd142900b69f6c59f0d (diff) |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'src/nix/flake.cc')
-rw-r--r-- | src/nix/flake.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nix/flake.cc b/src/nix/flake.cc index 57c5478c3..323810090 100644 --- a/src/nix/flake.cc +++ b/src/nix/flake.cc @@ -248,7 +248,7 @@ struct CmdFlakeCheck : FlakeCommand auto [drvPathS, outputName] = decodeContext(i); auto drvPath = store->parseStorePath(drvPathS); if (!outputName.empty() && drvPath.isDerivation()) - drvPaths.emplace_back(drvPath); + drvPaths.push_back({drvPath}); } } catch (Error & e) { e.addPrefix(fmt("while checking the app definition '" ANSI_BOLD "%s" ANSI_NORMAL "' at %s:\n", attrPath, pos)); @@ -392,7 +392,7 @@ struct CmdFlakeCheck : FlakeCommand fmt("%s.%s.%s", name, attr.name, attr2.name), *attr2.value, *attr2.pos); if ((std::string) attr.name == settings.thisSystem.get()) - drvPaths.emplace_back(drvPath); + drvPaths.push_back({drvPath}); } } } @@ -720,7 +720,7 @@ struct CmdFlakeArchive : FlakeCommand, MixJSON, MixDryRun StorePathSet sources; - sources.insert(flake.flake.sourceInfo->storePath.clone()); + sources.insert(flake.flake.sourceInfo->storePath); if (jsonRoot) jsonRoot->attr("path", store->printStorePath(flake.flake.sourceInfo->storePath)); |