c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

nixos/nix-required-mounts: nvidia-gpu preset requires hardware.graphics

Browse source
This commit is contained in:
Cameron Smith 2026-02-08 14:29:07 -05:00
commit 867b4878b7
No known key found for this signature in database
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/programs/nix-required-mounts.nix
View file

@ -111,6 +111,7 @@ in
lib.mkMerge [
{ nix.settings.pre-build-hook = lib.getExe cfg.package; }
(lib.mkIf cfg.presets.nvidia-gpu.enable {
hardware.graphics.enable = lib.mkDefault true;
nix.settings.system-features = cfg.allowedPatterns.nvidia-gpu.onFeatures;
programs.nix-required-mounts.allowedPatterns = {
inherit (defaults) nvidia-gpu;

7
pkgs/by-name/ni/nix-required-mounts/eval-test.nix
View file

@ -4,9 +4,8 @@
runCommand,
}:
let
machine = nixos {
base = nixos {
services.userborn.enable = true;
hardware.graphics.enable = true;
programs.nix-required-mounts = {
enable = true;
presets.nvidia-gpu.enable = true;
@ -15,8 +14,12 @@ let
boot.loader.grub.enable = false;
system.stateVersion = lib.trivial.release;
};
machine = base.extendModules {
modules = [ { hardware.graphics.enable = true; } ];
};
in
runCommand "nix-required-mounts-eval-nvidia-gpu-preset" { } ''
echo "Successfully evaluated ${base.config.system.build.toplevel}"
echo "Successfully evaluated ${machine.config.system.build.toplevel}"
echo "This means that combining nix-required-mounts with userborn no longer causes infinite recursion (#488199)"
touch $out