Unverified Commit 867b4878 authored by Cameron Smith's avatar Cameron Smith
Browse files

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

parent 02b74722

nixos/modules/programs/nix-required-mounts.nix

+1 −0
Original line number Diff line number Diff line
@@ -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;

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

+5 −2
Original line number Diff line number Diff line
@@ -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