aboutsummaryrefslogtreecommitdiff
path: root/src/nix/profile.cc
diff options
context:
space:
mode:
authorRok Garbas <rok@garbas.si>2022-03-24 12:28:38 +0100
committerRok Garbas <rok@garbas.si>2022-03-24 12:28:38 +0100
commit4546a007a46fe12b77a49ae8753ab186d0b55fdd (patch)
tree8d28946fb9baee5d6094da7939eb83c714cf4ca7 /src/nix/profile.cc
parent284cb0aad72e1c784535aec23f4610ffd77de63c (diff)
Fix flake profile use of originalUrl vs. originalUri
Fixes #5872
Diffstat (limited to 'src/nix/profile.cc')
-rw-r--r--src/nix/profile.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nix/profile.cc b/src/nix/profile.cc
index a8ff9c78a..da990ddc8 100644
--- a/src/nix/profile.cc
+++ b/src/nix/profile.cc
@@ -107,8 +107,9 @@ struct ProfileManifest
element.storePaths.insert(state.store->parseStorePath((std::string) p));
element.active = e["active"];
if (e.value("uri", "") != "") {
+ auto originalUrl = e.value("originalUrl", e["originalUri"]);
element.source = ProfileElementSource{
- parseFlakeRef(e["originalUri"]),
+ parseFlakeRef(originalUrl),
parseFlakeRef(e["uri"]),
e["attrPath"]
};
@@ -143,7 +144,7 @@ struct ProfileManifest
obj["storePaths"] = paths;
obj["active"] = element.active;
if (element.source) {
- obj["originalUri"] = element.source->originalRef.to_string();
+ obj["originalUrl"] = element.source->originalRef.to_string();
obj["uri"] = element.source->resolvedRef.to_string();
obj["attrPath"] = element.source->attrPath;
}