From d068f9ffff3d2a98e6dde0834a250e4930d44778 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 20 Feb 2020 22:14:44 +0100
Subject: Restore subdir support in registries

Hacky...
---
 src/libexpr/flake/flakeref.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/libexpr/flake')

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(
-- 
cgit v1.2.3