nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-11 11:31:03 +01:00
Code Activity

Merge pull request #14729 from NixOS/fix-add-dep

Browse source 
Fix Non-virtual interface pattern for `RestrictedStore::addDependency`
This commit is contained in:
John Ericson 2025-12-07 17:23:21 +00:00 • committed by GitHub
commit d8ad0006c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/unix/build/chroot-derivation-builder.cc
View file

@ -181,7 +181,7 @@ struct ChrootDerivationBuilder : virtual DerivationBuilderImpl
std::pair<Path, Path> addDependencyPrep(const StorePath & path) std::pair<Path, Path> addDependencyPrep(const StorePath & path)
{ {
DerivationBuilderImpl::addDependency(path); DerivationBuilderImpl::addDependencyImpl(path);
debug("materialising '%s' in the sandbox", store.printStorePath(path)); debug("materialising '%s' in the sandbox", store.printStorePath(path));

3
src/libstore/unix/build/linux-derivation-builder.cc
View file

@ -711,9 +711,6 @@ struct ChrootLinuxDerivationBuilder : ChrootDerivationBuilder, LinuxDerivationBu
void addDependencyImpl(const StorePath & path) override void addDependencyImpl(const StorePath & path) override
{ {
if (isAllowed(path))
return;
auto [source, target] = ChrootDerivationBuilder::addDependencyPrep(path); auto [source, target] = ChrootDerivationBuilder::addDependencyPrep(path);
/* Bind-mount the path into the sandbox. This requires /* Bind-mount the path into the sandbox. This requires