diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-30 09:51:17 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-30 09:51:17 +0100 |
commit | b9347167822d501f1da927120da197f32deb48fa (patch) | |
tree | 9aba87a80c17bd16c46258be40626e9b0e598757 /pkgs | |
parent | 1e4d675c4e06eac4eb2880fd9710a98c549cb132 (diff) | |
download | nixlib-b9347167822d501f1da927120da197f32deb48fa.tar nixlib-b9347167822d501f1da927120da197f32deb48fa.tar.gz nixlib-b9347167822d501f1da927120da197f32deb48fa.tar.bz2 nixlib-b9347167822d501f1da927120da197f32deb48fa.tar.lz nixlib-b9347167822d501f1da927120da197f32deb48fa.tar.xz nixlib-b9347167822d501f1da927120da197f32deb48fa.tar.zst nixlib-b9347167822d501f1da927120da197f32deb48fa.zip |
nvidia_x11_legacy304: fix build with kernel 4.14
/cc #31640.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 2222cdf62c37..41f83bfda800 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -4,6 +4,15 @@ let generic = args: callPackage (import ./generic.nix args) { }; kernel = callPackage # a hacky way of extracting parameters from callPackage ({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { }; + + maybePatch_drm_legacy = + lib.optional (lib.versionOlder "4.14" (kernel.version or "0")) + (fetchurl { + url = "https://raw.githubusercontent.com/MilhouseVH/LibreELEC.tv/b5d2d6a1" + + "/packages/x11/driver/xf86-video-nvidia-legacy/patches/" + + "xf86-video-nvidia-legacy-0010-kernel-4.14.patch"; + sha256 = "18clfpw03g8dxm61bmdkmccyaxir3gnq451z6xqa2ilm3j820aa5"; + }); in { # Policy: use the highest stable version as the default (on our master). @@ -23,6 +32,7 @@ in persistencedSha256 = "08315rb9l932fgvy758an5vh3jgks0qc4g36xip4l32pkxd9k963"; }; + legacy_340 = generic { version = "340.104"; sha256_32bit = "1l8w95qpxmkw33c4lsf5ar9w2fkhky4x23rlpqvp1j66wbw1b473"; @@ -31,15 +41,7 @@ in persistencedSha256 = "0zqws2vsrxbxhv6z0nn2galnghcsilcn3s0f70bpm6jqj9wzy7x8"; useGLVND = false; - patches = - lib.optional (lib.versionOlder "4.14" (kernel.version or "0")) - (fetchurl { - url = "https://raw.githubusercontent.com/MilhouseVH/LibreELEC.tv/b5d2d6a1" - + "/packages/x11/driver/xf86-video-nvidia-legacy/patches/" - + "xf86-video-nvidia-legacy-0010-kernel-4.14.patch"; - sha256 = "18clfpw03g8dxm61bmdkmccyaxir3gnq451z6xqa2ilm3j820aa5"; - }) - ; + patches = maybePatch_drm_legacy; }; legacy_304 = generic { @@ -65,6 +67,7 @@ in patches="$patches ${lib.concatMapStringsSep " " (pname: "${prefix}/${pname}.patch") pnames}" ''; in applyPatches [ "fix-typos" ]; + patches = maybePatch_drm_legacy; }; legacy_173 = callPackage ./legacy173.nix { }; |