mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-14 14:10:33 +03:00
Merge master into staging-next
This commit is contained in:
commit
f2e88eaafe
102 changed files with 700 additions and 368 deletions
|
@ -113,6 +113,19 @@ in
|
|||
}
|
||||
];
|
||||
|
||||
warnings =
|
||||
lib.mkIf
|
||||
(
|
||||
(lib.elem "nvidia" config.services.xserver.videoDrivers)
|
||||
&& !config.hardware.nvidia.open
|
||||
&& (lib.versionOlder "551" (
|
||||
lib.versions.major (lib.getVersion config.hardware.nvidia.package)
|
||||
))
|
||||
)
|
||||
[
|
||||
"Using Sway with Nvidia driver version <= 550 may result in a broken system. Configure hardware.nvidia.package to use a newer version."
|
||||
];
|
||||
|
||||
environment = {
|
||||
systemPackages = lib.optional (cfg.package != null) cfg.package ++ cfg.extraPackages;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue