qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linuxPackages.nvidiaPackages.latest.open: fix for linux 6.11

Browse Source 
Fixes framebuffer support in Linux 6.11.

Fixes #343774, #323396.
This commit is contained in:
Franz Pletz 2024-09-25 17:44:31 +02:00
parent ed3371c607
commit 841f166ff9
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -22,6 +22,12 @@ let
url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch"; url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch";
hash = "sha256-eZiQQp2S/asE7MfGvfe6dA/kdCvek9SYa/FFGp24dVg="; hash = "sha256-eZiQQp2S/asE7MfGvfe6dA/kdCvek9SYa/FFGp24dVg=";
}; };
# Fixes framebuffer with linux 6.11
fbdev_linux_611_patch = fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/NVIDIA/open-gpu-kernel-modules/pull/692.patch";
hash = "sha256-OYw8TsHDpBE5DBzdZCBT45+AiznzO9SfECz5/uXN5Uc=";
};
in in
rec { rec {
mkDriver = generic; mkDriver = generic;
@ -48,6 +54,7 @@ rec {
openSha256 = "sha256-/32Zf0dKrofTmPZ3Ratw4vDM7B+OgpC4p7s+RHUjCrg="; openSha256 = "sha256-/32Zf0dKrofTmPZ3Ratw4vDM7B+OgpC4p7s+RHUjCrg=";
settingsSha256 = "sha256-kQsvDgnxis9ANFmwIwB7HX5MkIAcpEEAHc8IBOLdXvk="; settingsSha256 = "sha256-kQsvDgnxis9ANFmwIwB7HX5MkIAcpEEAHc8IBOLdXvk=";
persistencedSha256 = "sha256-E2J2wYYyRu7Kc3MMZz/8ZIemcZg68rkzvqEwFAL3fFs="; persistencedSha256 = "sha256-E2J2wYYyRu7Kc3MMZz/8ZIemcZg68rkzvqEwFAL3fFs=";
patchesOpen = [ fbdev_linux_611_patch ];
}); });
beta = selectHighestVersion latest (generic { beta = selectHighestVersion latest (generic {

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

@ -23,6 +23,7 @@
, postPatch ? null , postPatch ? null
, patchFlags ? null , patchFlags ? null
, patches ? [ ] , patches ? [ ]
, patchesOpen ? [ ]
, preInstall ? null , preInstall ? null
, postInstall ? null , postInstall ? null
, broken ? false , broken ? false
@ -201,6 +202,7 @@ let
(hash: callPackage ./open.nix { (hash: callPackage ./open.nix {
inherit hash; inherit hash;
nvidia_x11 = self; nvidia_x11 = self;
patches = patchesOpen;
broken = brokenOpen; broken = brokenOpen;
}) })
openSha256; openSha256;

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

@ -4,6 +4,7 @@
, kernel , kernel
, nvidia_x11 , nvidia_x11
, hash , hash
, patches ? [ ]
, broken ? false , broken ? false
}: }:
@ -18,6 +19,8 @@ stdenv.mkDerivation ({
inherit hash; inherit hash;
}; };
inherit patches;
nativeBuildInputs = kernel.moduleBuildDependencies; nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [ makeFlags = kernel.makeFlags ++ [