From 3775f1e53ec04a8e71fa4f32675846febadc2a7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 2 Dec 2018 10:45:13 +0000 Subject: [PATCH] linuxPackages_4_18.nvidia_x11_legacy304: mark as broken on 4.18 and newer --- pkgs/os-specific/linux/nvidia-x11/default.nix | 1 + pkgs/os-specific/linux/nvidia-x11/generic.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 49f1500f2068..016d03a61f87 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -75,5 +75,6 @@ rec { ''; in applyPatches [ "fix-typos" ]; patches = maybePatch_drm_legacy; + broken = stdenv.lib.versionAtLeast kernel.version "4.18"; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index a40a64344932..be378d66caf9 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -10,6 +10,7 @@ , prePatch ? "" , patches ? [] +, broken ? false }: { stdenv, callPackage, pkgsi686Linux, fetchurl @@ -91,6 +92,7 @@ let platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ maintainers.vcunat ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" + inherit broken; }; };