Skip to content

linuxPackages.nvidiaPackages.*.open: fix for linux 6.11 #344460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 27, 2024
Merged

linuxPackages.nvidiaPackages.*.open: fix for linux 6.11 #344460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pkgs/os-specific/linux/nvidia-x11/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
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
rec {
mkDriver = generic;
Expand All @@ -48,6 +54,7 @@ rec {
openSha256 = "sha256-/32Zf0dKrofTmPZ3Ratw4vDM7B+OgpC4p7s+RHUjCrg=";
settingsSha256 = "sha256-kQsvDgnxis9ANFmwIwB7HX5MkIAcpEEAHc8IBOLdXvk=";
persistencedSha256 = "sha256-E2J2wYYyRu7Kc3MMZz/8ZIemcZg68rkzvqEwFAL3fFs=";
patchesOpen = [ fbdev_linux_611_patch ];
});

beta = selectHighestVersion latest (generic {
Expand Down
2 changes: 2 additions & 0 deletions pkgs/os-specific/linux/nvidia-x11/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
, postPatch ? null
, patchFlags ? null
, patches ? [ ]
, patchesOpen ? [ ]
, preInstall ? null
, postInstall ? null
, broken ? false
Expand Down Expand Up @@ -201,6 +202,7 @@ let
(hash: callPackage ./open.nix {
inherit hash;
nvidia_x11 = self;
patches = patchesOpen;
broken = brokenOpen;
})
openSha256;
Expand Down
3 changes: 3 additions & 0 deletions pkgs/os-specific/linux/nvidia-x11/open.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
, kernel
, nvidia_x11
, hash
, patches ? [ ]
, broken ? false
}:

Expand All @@ -18,6 +19,8 @@ stdenv.mkDerivation ({
inherit hash;
};

inherit patches;

nativeBuildInputs = kernel.moduleBuildDependencies;

makeFlags = kernel.makeFlags ++ [
Expand Down