diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-02-20 22:14:44 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-02-20 22:14:44 +0100 |
| commit | d068f9ffff3d2a98e6dde0834a250e4930d44778 (patch) | |
| tree | ea9359e05ea924fb32fe11c190bdefd13437d4b4 /src/libexpr/flake | |
| parent | 890df325c76a9acd90300bb3590e7d1b102e2c28 (diff) | |
Restore subdir support in registries
Hacky...
Diffstat (limited to 'src/libexpr/flake')
| -rw-r--r-- | src/libexpr/flake/flakeref.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libexpr/flake/flakeref.cc b/src/libexpr/flake/flakeref.cc index c46661df8..b61352749 100644 --- a/src/libexpr/flake/flakeref.cc +++ b/src/libexpr/flake/flakeref.cc @@ -40,7 +40,8 @@ bool FlakeRef::operator ==(const FlakeRef & other) const FlakeRef FlakeRef::resolve(ref<Store> store) const { - return FlakeRef(lookupInRegistries(store, input), subdir); + auto [input2, extraAttrs] = lookupInRegistries(store, input); + return FlakeRef(input2, fetchers::maybeGetStrAttr(extraAttrs, "subdir").value_or(subdir)); } FlakeRef parseFlakeRef( |