Unverified Commit 841f166f authored by Franz Pletz's avatar Franz Pletz
Browse files

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

Fixes framebuffer support in Linux 6.11.

Fixes #343774, #323396.
parent ed3371c6

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

+7 −0
Original line number Diff line number Diff line
@@ -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;
@@ -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 {

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

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
, postPatch ? null

, patchFlags ? null

, patches ? [ ]

, patchesOpen ? [ ]

, preInstall ? null

, postInstall ? null

, broken ? false
@@ -201,6 +202,7 @@ let 
          (hash: callPackage ./open.nix {

            inherit hash;

            nvidia_x11 = self;

            patches = patchesOpen;

            broken = brokenOpen;

          })

          openSha256;

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

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
, kernel

, nvidia_x11

, hash

, patches ? [ ]

, broken ? false

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

  };



  inherit patches;



  nativeBuildInputs = kernel.moduleBuildDependencies;



  makeFlags = kernel.makeFlags ++ [