diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-09-16 22:35:24 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-09-16 22:35:24 +0000 |
| commit | f60b380a7f32406659efee282cde4c1330fc1c65 (patch) | |
| tree | 8bd0680b8fafa02c93b29d0934133b0ff5b29e7a /src/nix/installables.hh | |
| parent | c08c9f08c75bf379439348cccb5b8871a27bf498 (diff) | |
| parent | 5080d4e7b2525d1656282c65a217a22ff8381df3 (diff) | |
Merge remote-tracking branch 'upstream/master' into remove-storetype-delegate-regStore
Diffstat (limited to 'src/nix/installables.hh')
| -rw-r--r-- | src/nix/installables.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nix/installables.hh b/src/nix/installables.hh index 26e87ee3a..c7c2f8981 100644 --- a/src/nix/installables.hh +++ b/src/nix/installables.hh @@ -20,7 +20,7 @@ struct BuildableOpaque { struct BuildableFromDrv { StorePath drvPath; - std::map<std::string, StorePath> outputs; + std::map<std::string, std::optional<StorePath>> outputs; }; typedef std::variant< @@ -69,7 +69,7 @@ struct Installable virtual FlakeRef nixpkgsFlakeRef() const { - return std::move(FlakeRef::fromAttrs({{"type","indirect"}, {"id", "nixpkgs"}})); + return FlakeRef::fromAttrs({{"type","indirect"}, {"id", "nixpkgs"}}); } }; @@ -82,7 +82,7 @@ struct InstallableValue : Installable struct DerivationInfo { StorePath drvPath; - StorePath outPath; + std::optional<StorePath> outPath; std::string outputName; }; |