max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-25 07:16:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10861 from DeterminateSystems/fix-optional-deref

Browse source 
PackageInfo::queryDrvPath(): Don't dereference an empty optional
This commit is contained in:
Eelco Dolstra 2024-06-05 16:48:09 +02:00 committed by GitHub
commit edd445f745
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libexpr/get-drvs.cc
View file

@ -82,8 +82,7 @@ std::optional<StorePath> PackageInfo::queryDrvPath() const
} else } else
drvPath = {std::nullopt}; drvPath = {std::nullopt};
} }
drvPath.value_or(std::nullopt); return drvPath.value_or(std::nullopt);
return *drvPath;
} }

2
src/libexpr/print.cc
View file

@ -278,7 +278,7 @@ private:
storePath = state.coerceToStorePath(i->pos, *i->value, context, "while evaluating the drvPath of a derivation"); storePath = state.coerceToStorePath(i->pos, *i->value, context, "while evaluating the drvPath of a derivation");
} }
/* This unforutately breaks printing nested values because of /* This unfortunately breaks printing nested values because of
how the pretty printer is used (when pretting printing and warning how the pretty printer is used (when pretting printing and warning
to same terminal / std stream). */ to same terminal / std stream). */
#if 0 #if 0