From 31c3a53dc30942732f67a96cf54b73291e46e3c2 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sat, 18 May 2019 18:41:53 +0900 Subject: [PATCH] Conditionally include nvidia modules --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 82ac359158b9..2290a7e80a1e 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,7 +1,11 @@ { lib, callPackage, fetchurl, stdenv }: 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, libsOnly ? false }: if libsOnly then { } else kernel) { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6e303360ac1..c81a4f0760d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15706,7 +15706,7 @@ in 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 { }; @@ -15726,7 +15726,7 @@ in phc-intel = callPackage ../os-specific/linux/phc-intel { }; # 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 { };