Merge branch 'path-info' into ca-drv-exotic

1 files changed, 6 insertions, 4 deletions

diff --git a/src/libstore/content-address.hh b/src/libstore/content-address.hh
index 729b1078d..962a50c6b 100644
--- a/src/libstore/content-address.hh
+++ b/src/libstore/content-address.hh
@@ -118,18 +118,20 @@ struct StoreReferences {
  */
 
 // This matches the additional info that we need for makeTextPath
-struct TextInfo : TextHash {
+struct TextInfo {
+    TextHash hash;
     // References for the paths, self references disallowed
     StorePathSet references;
 
-    GENERATE_CMP(TextInfo, *(const TextHash *)me, me->references);
+    GENERATE_CMP(TextInfo, me->hash, me->references);
 };
 
-struct FixedOutputInfo : FixedOutputHash {
+struct FixedOutputInfo {
+    FixedOutputHash hash;
     // References for the paths
     StoreReferences references;
 
-    GENERATE_CMP(FixedOutputInfo, *(const FixedOutputHash *)me, me->references);
+    GENERATE_CMP(FixedOutputInfo, me->hash, me->references);
 };
 
 typedef std::variant<