dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #200865 from Kiskae/preempt-IBT-breakage

Browse Source
This commit is contained in:
Bernardo Meurer 2022-11-12 14:06:36 -05:00 committed by GitHub
commit a1aecb7c94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/os-specific/linux/nvidia-x11/generic.nix
View File

@ -127,7 +127,8 @@ let
platforms = [ "x86_64-linux" ] ++ optionals (!i686bundled) [ "i686-linux" ]; platforms = [ "x86_64-linux" ] ++ optionals (!i686bundled) [ "i686-linux" ];
maintainers = with maintainers; [ jonringer ]; maintainers = with maintainers; [ jonringer ];
priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
inherit broken; # proprietary driver currently does not support X86_KERNEL_IBT, which is scheduled to be added in linux 6.2
broken = broken || (kernel != null && kernel.kernelAtLeast "6.2");
}; };
}; };