ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-05 03:57:58 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #337289 from Kiskae/nvidia/fixes_2024_08_25

Browse Source 
nixos/nvidia: various fixes
This commit is contained in:
Nick Cao 2024-08-25 17:36:24 -04:00 committed by GitHub
commit 2a7a22122f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2411.section.md
View File

@ -146,6 +146,8 @@
Processes also now run as a dynamically allocated user by default instead of
root.
- The nvidia driver no longer defaults to the proprietary driver starting with version 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open driver.
- `singularity-tools` have the `storeDir` argument removed from its override interface and use `builtins.storeDir` instead.
- Two build helpers in `singularity-tools`, i.e., `mkLayer` and `shellScript`, are deprecated, as they are no longer involved in image-building. Maintainers will remove them in future releases.

36
nixos/modules/hardware/video/nvidia.nix
View File

@ -254,10 +254,21 @@ in
'';
};
open = lib.mkEnableOption ''
the open source NVIDIA kernel module
open = lib.mkOption {
example = true;
description = "Whether to enable the open source NVIDIA kernel module.";
type = lib.types.bool;
defaultText = lib.literalExpression ''
lib.mkIf (lib.versionOlder config.hardware.nvidia.package.version "560") false
'';
};
gsp.enable = lib.mkEnableOption ''
the GPU System Processor (GSP) on the video card
'' // {
defaultText = lib.literalExpression ''lib.versionAtLeast config.hardware.nvidia.package.version "560"'';
defaultText = lib.literalExpression ''
config.hardware.nvidia.open || lib.versionAtLeast config.hardware.nvidia.package.version "555"
'';
};
};
};
@ -308,7 +319,8 @@ in
};
environment.systemPackages = [ nvidia_x11.bin ];
hardware.nvidia.open = lib.mkDefault (lib.versionAtLeast nvidia_x11.version "560");
hardware.nvidia.open = lib.mkIf (lib.versionOlder nvidia_x11.version "560") (lib.mkDefault false);
hardware.nvidia.gsp.enable = lib.mkDefault (cfg.open || lib.versionAtLeast nvidia_x11.version "555");
})
# X11
@ -367,8 +379,18 @@ in
}
{
assertion = cfg.open -> (cfg.package ? open && cfg.package ? firmware);
message = "This version of NVIDIA driver does not provide a corresponding opensource kernel driver";
assertion = cfg.gsp.enable -> (cfg.package ? firmware);
message = "This version of NVIDIA driver does not provide a GSP firmware.";
}
{
assertion = cfg.open -> (cfg.package ? open);
message = "This version of NVIDIA driver does not provide a corresponding opensource kernel driver.";
}
{
assertion = cfg.open -> cfg.gsp.enable;
message = "The GSP cannot be disabled when using the opensource kernel driver.";
}
{
@ -555,7 +577,7 @@ in
services.dbus.packages = lib.optional cfg.dynamicBoost.enable nvidia_x11.bin;
hardware.firmware = lib.optional (cfg.open || lib.versionAtLeast nvidia_x11.version "555") nvidia_x11.firmware;
hardware.firmware = lib.optional cfg.gsp.enable nvidia_x11.firmware;
systemd.tmpfiles.rules =
[

3
pkgs/os-specific/linux/nvidia-x11/builder.sh
View File

@ -81,6 +81,9 @@ installPhase() {
mkdir $i/lib/vdpau
mv $i/lib/libvdpau* $i/lib/vdpau
# Compatibility with openssl 1.1, unused
rm -f $i/lib/libnvidia-pkcs11.so*
# Install ICDs, make absolute paths.
# Be careful not to modify any original files because this runs twice.