summary refs log tree commit diff
path: root/pkgs/os-specific/linux/nvidia-x11
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2018-12-02 10:45:13 +0000
committerJörg Thalheim <joerg@thalheim.io>2018-12-02 10:46:11 +0000
commit3775f1e53ec04a8e71fa4f32675846febadc2a7b (patch)
tree2a61b8cde7f8987b61e877a525beec400fddf2d8 /pkgs/os-specific/linux/nvidia-x11
parentcc7eb74622644b628c4e22f21424b92efbdbbcb5 (diff)
downloadnixpkgs-3775f1e53ec04a8e71fa4f32675846febadc2a7b.tar
nixpkgs-3775f1e53ec04a8e71fa4f32675846febadc2a7b.tar.gz
nixpkgs-3775f1e53ec04a8e71fa4f32675846febadc2a7b.tar.bz2
nixpkgs-3775f1e53ec04a8e71fa4f32675846febadc2a7b.tar.lz
nixpkgs-3775f1e53ec04a8e71fa4f32675846febadc2a7b.tar.xz
nixpkgs-3775f1e53ec04a8e71fa4f32675846febadc2a7b.tar.zst
nixpkgs-3775f1e53ec04a8e71fa4f32675846febadc2a7b.zip
linuxPackages_4_18.nvidia_x11_legacy304: mark as broken on 4.18 and newer
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11')
-rw-r--r--pkgs/os-specific/linux/nvidia-x11/default.nix1
-rw-r--r--pkgs/os-specific/linux/nvidia-x11/generic.nix2
2 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 49f1500f206..016d03a61f8 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 a40a6434493..be378d66caf 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;
     };
   };