Fix narSize usage in Perl bindings too

NixOS · Sep 24, 2020 · 04ecf5c · 04ecf5c
1 parent bf27d32
commit 04ecf5c
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/perl/lib/Nix/Store.xs b/perl/lib/Nix/Store.xs
@@ -111,14 +111,17 @@ SV * queryPathInfo(char * path, int base32)
  XPUSHs(&PL_sv_undef);
  else
  XPUSHs(sv_2mortal(newSVpv(store()->printStorePath(*info->deriver).c_str(), 0)));
- if (auto optHash = info->optNarHash()) {
- auto s = optHash->to_string(base32 ? Base32 : Base16, true);
+ if (auto optHashSize = *info->viewHashResultConst()) {
+ auto [narHash, narSize] = *optHashSize;
+ auto s = narHash.to_string(base32 ? Base32 : Base16, true);
  XPUSHs(sv_2mortal(newSVpv(s.c_str(), 0)));
+ mXPUSHi(info->registrationTime);
+ mXPUSHi(narSize);
  } else {
  XPUSHs((SV *) NULL);
+ mXPUSHi(info->registrationTime);
+ mXPUSHi(0);
  }
- mXPUSHi(info->registrationTime);
- mXPUSHi(info->narSize);
  AV * arr = newAV();
  for (auto & i : info->references)
  av_push(arr, newSVpv(store()->printStorePath(i).c_str(), 0));