nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-25 00:02:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup: Re-enable import .drv code

Browse Source
This commit is contained in:
Robert Hensing 2024-08-26 12:46:01 +02:00
parent 68a5cfd30e
commit 359d124bbf
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libexpr/primops.cc
View File

@ -178,10 +178,6 @@ static void import(EvalState & state, const PosIdx pos, Value & vPath, Value * v
auto path = realisePath(state, pos, vPath, std::nullopt); auto path = realisePath(state, pos, vPath, std::nullopt);
auto path2 = path.path.abs(); auto path2 = path.path.abs();
// FIXME: corruption?
// TODO(tomberek): re-enable this code?
#if 0
// FIXME
auto isValidDerivationInStore = [&]() -> std::optional<StorePath> { auto isValidDerivationInStore = [&]() -> std::optional<StorePath> {
if (!state.store->isStorePath(path2)) if (!state.store->isStorePath(path2))
return std::nullopt; return std::nullopt;
@ -219,11 +215,7 @@ static void import(EvalState & state, const PosIdx pos, Value & vPath, Value * v
state.forceFunction(**state.vImportedDrvToDerivation, pos, "while evaluating imported-drv-to-derivation.nix.gen.hh"); state.forceFunction(**state.vImportedDrvToDerivation, pos, "while evaluating imported-drv-to-derivation.nix.gen.hh");
v.mkApp(*state.vImportedDrvToDerivation, w); v.mkApp(*state.vImportedDrvToDerivation, w);
state.forceAttrs(v, pos, "while calling imported-drv-to-derivation.nix.gen.hh"); state.forceAttrs(v, pos, "while calling imported-drv-to-derivation.nix.gen.hh");
} } else {
else
#endif
{
if (!vScope) if (!vScope)
state.evalFile(path, v); state.evalFile(path, v);
else { else {