From 4d788bda18fb1ed5536f7de6ee3bbd2eb3084292 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 5 Jun 2024 16:17:24 +0200 Subject: [PATCH] PackageInfo::queryDrvPath(): Don't dereference an empty optional Fixes a regression introduced in f923ed6b6a7318e8fc77e8d3aeda6796671f67cb. https://hydra.nixos.org/build/262267313 (cherry picked from commit d2eeabf3e68f65493a8bfeb2ba762c37fcf60e15) --- src/libexpr/get-drvs.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libexpr/get-drvs.cc b/src/libexpr/get-drvs.cc index ed16a51a1..0d2aecc58 100644 --- a/src/libexpr/get-drvs.cc +++ b/src/libexpr/get-drvs.cc @@ -82,8 +82,7 @@ std::optional PackageInfo::queryDrvPath() const } else drvPath = {std::nullopt}; } - drvPath.value_or(std::nullopt); - return *drvPath; + return drvPath.value_or(std::nullopt); }