wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 08:31:16 +02:00
Code Activity

C API: fix after rebase

Browse source
This commit is contained in:
José Luis Lafuente 2024-02-25 00:26:36 +01:00 • committed by José Luis Lafuente
parent 6c231dcf68
commit 2349185c96
No known key found for this signature in database
GPG key ID: 8A3455EBE455489A
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libexpr/c/nix_api_external.cc
View file

@ -108,17 +108,21 @@ public:
* Coerce the value to a string.
*/
virtual std::string coerceToString(
const nix::Pos & pos, nix::NixStringContext & context, bool copyMore, bool copyToStore) const override
nix::EvalState & state,
const nix::PosIdx & pos,
nix::NixStringContext & context,
bool copyMore,
bool copyToStore) const override
{
if (!desc.coerceToString) {
return nix::ExternalValueBase::coerceToString(pos, context, copyMore, copyToStore);
return nix::ExternalValueBase::coerceToString(state, pos, context, copyMore, copyToStore);
}
nix_string_context ctx{context};
nix_string_return res{""};
// todo: pos, errors
desc.coerceToString(v, &ctx, copyMore, copyToStore, &res);
if (res.str.empty()) {
return nix::ExternalValueBase::coerceToString(pos, context, copyMore, copyToStore);
return nix::ExternalValueBase::coerceToString(state, pos, context, copyMore, copyToStore);
}
return std::move(res.str);
}