ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

Merge #51378: linuxPackages.nvidia_x11_legacy304: broken on 4.18+

Browse Source
This commit is contained in:
Vladimír Čunát 2018-12-02 14:27:52 +01:00
commit 70f507ae56
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -75,5 +75,6 @@ rec {
''; '';
in applyPatches [ "fix-typos" ]; in applyPatches [ "fix-typos" ];
patches = maybePatch_drm_legacy; patches = maybePatch_drm_legacy;
broken = stdenv.lib.versionAtLeast kernel.version "4.18";
}; };
} }

2
pkgs/os-specific/linux/nvidia-x11/generic.nix
View File

@ -10,6 +10,7 @@
, prePatch ? "" , prePatch ? ""
, patches ? [] , patches ? []
, broken ? false
}: }:
{ stdenv, callPackage, pkgsi686Linux, fetchurl { stdenv, callPackage, pkgsi686Linux, fetchurl
@ -91,6 +92,7 @@ let
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];
maintainers = [ maintainers.vcunat ]; maintainers = [ maintainers.vcunat ];
priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
inherit broken;
}; };
}; };