public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conditionally include nvidia modules

This commit is contained in:
Matthieu Coudron 2019-05-18 18:41:53 +09:00
parent 4e30a2852c
commit 31c3a53dc3
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,11 @@
{ lib, callPackage, fetchurl, stdenv }: { lib, callPackage, fetchurl, stdenv }:
let let
generic = args: callPackage (import ./generic.nix args) { };
generic = args:
if ((!lib.versionOlder args.version "391")
&& stdenv.hostPlatform.system != "x86_64-linux") then null
else callPackage (import ./generic.nix args) { };
kernel = callPackage # a hacky way of extracting parameters from callPackage kernel = callPackage # a hacky way of extracting parameters from callPackage
({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { }; ({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { };

4
pkgs/top-level/all-packages.nix
View File

@ -15706,7 +15706,7 @@ in
facetimehd = callPackage ../os-specific/linux/facetimehd { }; facetimehd = callPackage ../os-specific/linux/facetimehd { };
jool = if stdenv.lib.versionOlder kernel.version "4.18" then callPackage ../os-specific/linux/jool { } else null; jool = callPackage ../os-specific/linux/jool { };
mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { }; mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { };
@ -15726,7 +15726,7 @@ in
phc-intel = callPackage ../os-specific/linux/phc-intel { }; phc-intel = callPackage ../os-specific/linux/phc-intel { };
# Disable for kernels 4.15 and above due to compatibility issues # Disable for kernels 4.15 and above due to compatibility issues
prl-tools = if stdenv.lib.versionOlder kernel.version "4.15" then null else callPackage ../os-specific/linux/prl-tools { }; prl-tools = if stdenv.lib.versionOlder kernel.version "4.15" then callPackage ../os-specific/linux/prl-tools { } else null;
sch_cake = callPackage ../os-specific/linux/sch_cake { }; sch_cake = callPackage ../os-specific/linux/sch_cake { };