Skip to content

Commit 1174fd6

Browse files
authored
linuxPackages.nvidiaPackages.*.open: fix for linux 6.11 (#344460)
2 parents 0410580 + 841f166 commit 1174fd6

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

pkgs/os-specific/linux/nvidia-x11/default.nix

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ let
2222
url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch";
2323
hash = "sha256-eZiQQp2S/asE7MfGvfe6dA/kdCvek9SYa/FFGp24dVg=";
2424
};
25+
26+
# Fixes framebuffer with linux 6.11
27+
fbdev_linux_611_patch = fetchpatch {
28+
url = "https://patch-diff.githubusercontent.com/raw/NVIDIA/open-gpu-kernel-modules/pull/692.patch";
29+
hash = "sha256-OYw8TsHDpBE5DBzdZCBT45+AiznzO9SfECz5/uXN5Uc=";
30+
};
2531
in
2632
rec {
2733
mkDriver = generic;
@@ -48,6 +54,7 @@ rec {
4854
openSha256 = "sha256-/32Zf0dKrofTmPZ3Ratw4vDM7B+OgpC4p7s+RHUjCrg=";
4955
settingsSha256 = "sha256-kQsvDgnxis9ANFmwIwB7HX5MkIAcpEEAHc8IBOLdXvk=";
5056
persistencedSha256 = "sha256-E2J2wYYyRu7Kc3MMZz/8ZIemcZg68rkzvqEwFAL3fFs=";
57+
patchesOpen = [ fbdev_linux_611_patch ];
5158
});
5259

5360
beta = selectHighestVersion latest (generic {

pkgs/os-specific/linux/nvidia-x11/generic.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
, postPatch ? null
2424
, patchFlags ? null
2525
, patches ? [ ]
26+
, patchesOpen ? [ ]
2627
, preInstall ? null
2728
, postInstall ? null
2829
, broken ? false
@@ -201,6 +202,7 @@ let
201202
(hash: callPackage ./open.nix {
202203
inherit hash;
203204
nvidia_x11 = self;
205+
patches = patchesOpen;
204206
broken = brokenOpen;
205207
})
206208
openSha256;

pkgs/os-specific/linux/nvidia-x11/open.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
, kernel
55
, nvidia_x11
66
, hash
7+
, patches ? [ ]
78
, broken ? false
89
}:
910

@@ -18,6 +19,8 @@ stdenv.mkDerivation ({
1819
inherit hash;
1920
};
2021

22+
inherit patches;
23+
2124
nativeBuildInputs = kernel.moduleBuildDependencies;
2225

2326
makeFlags = kernel.makeFlags ++ [

0 commit comments

Comments
 (0)