summary refs log tree commit diff
path: root/pkgs/os-specific/linux/nvidia-x11/generic.nix
diff options
context:
space:
mode:
authorEdmund Wu <fangkazuto@gmail.com>2018-08-23 18:27:10 -0400
committerEdmund Wu <fangkazuto@gmail.com>2018-08-23 18:27:10 -0400
commit77d49ae9a322e18683f5b6cbfc7b18c681eed8e8 (patch)
tree280600d531415c83fa3d522ab44ca7cce52ebac6 /pkgs/os-specific/linux/nvidia-x11/generic.nix
parenta77a1190d30b8453e43dd61ee560b89a9dac48b8 (diff)
downloadnixpkgs-77d49ae9a322e18683f5b6cbfc7b18c681eed8e8.tar
nixpkgs-77d49ae9a322e18683f5b6cbfc7b18c681eed8e8.tar.gz
nixpkgs-77d49ae9a322e18683f5b6cbfc7b18c681eed8e8.tar.bz2
nixpkgs-77d49ae9a322e18683f5b6cbfc7b18c681eed8e8.tar.lz
nixpkgs-77d49ae9a322e18683f5b6cbfc7b18c681eed8e8.tar.xz
nixpkgs-77d49ae9a322e18683f5b6cbfc7b18c681eed8e8.tar.zst
nixpkgs-77d49ae9a322e18683f5b6cbfc7b18c681eed8e8.zip
Revert "Merge #45509: nvidia_x11*: mark broken on 4.18"
This reverts commit d5e2f91ec8411b3ca981698d53b12982c93533c5, reversing
changes made to a850a140fbe57e68041806b5a36cb1319e96f21e.
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11/generic.nix')
-rw-r--r--pkgs/os-specific/linux/nvidia-x11/generic.nix1
1 files changed, 0 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index eeb5a3588e3..0ededc08050 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -84,7 +84,6 @@ let
       platforms = [ "i686-linux" "x86_64-linux" ];
       maintainers = [ maintainers.vcunat ];
       priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
-      broken = stdenv.lib.versionAtLeast kernel.version "4.18";
     };
   };