nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-16 07:22:43 +01:00
Code Activity

Create StringSet DerivationBuilderParams::systemFeatures

Browse source 
Do this to avoid checking "system features" from the store config
directly, because we rather not have `DerivationBuilder` depend on
`Store`.
This commit is contained in:
John Ericson 2025-08-21 13:15:19 -04:00
parent f5f9e32f54
commit f4a0161cb1
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libstore/build/derivation-building-goal.cc
View file

@ -766,6 +766,7 @@ Goal::Co DerivationBuildingGoal::tryToBuild()
.initialOutputs = initialOutputs,
.buildMode = buildMode,
.defaultPathsInChroot = std::move(defaultPathsInChroot),
.systemFeatures = worker.store.config.systemFeatures.get(),
.finalEnv = std::move(finalEnv),
.extraFiles = std::move(extraFiles),
});

8
src/libstore/include/nix/store/build/derivation-builder.hh
View file

@ -65,6 +65,14 @@ struct DerivationBuilderParams
*/
PathsInChroot defaultPathsInChroot;
/**
* May be used to control various platform-specific functionality.
*
* For example, on Linux, the `kvm` system feature controls whether
* `/dev/kvm` should be exposed to the builder within the sandbox.
*/
StringSet systemFeatures;
struct EnvEntry
{
/**

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

@ -492,7 +492,7 @@ struct ChrootLinuxDerivationBuilder : ChrootDerivationBuilder, LinuxDerivationBu
createDirs(chrootRootDir + "/dev/shm");
createDirs(chrootRootDir + "/dev/pts");
ss.push_back("/dev/full");
if (store.Store::config.systemFeatures.get().count("kvm") && pathExists("/dev/kvm"))
if (systemFeatures.count("kvm") && pathExists("/dev/kvm"))
ss.push_back("/dev/kvm");
ss.push_back("/dev/null");
ss.push_back("/dev/random");