Skip to content

nixos: hardware.nvidia.package option for selecting nvidia package #49703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
FRidh wants to merge 1 commit into from
Closed

nixos: hardware.nvidia.package option for selecting nvidia package #49703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 21 additions & 28 deletions nixos/modules/hardware/video/nvidia.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,17 @@
with lib;

let

drivers = config.services.xserver.videoDrivers;

# FIXME: should introduce an option like
# ‘hardware.video.nvidia.package’ for overriding the default NVIDIA
# driver.
nvidiaForKernel = kernelPackages:
if elem "nvidia" drivers then
kernelPackages.nvidia_x11
else if elem "nvidiaBeta" drivers then
kernelPackages.nvidia_x11_beta
else if elem "nvidiaLegacy304" drivers then
kernelPackages.nvidia_x11_legacy304
else if elem "nvidiaLegacy340" drivers then
kernelPackages.nvidia_x11_legacy340
else if elem "nvidiaLegacy390" drivers then
kernelPackages.nvidia_x11_legacy390
else null;

nvidia_x11 = nvidiaForKernel config.boot.kernelPackages;
nvidia_libs32 =
if versionOlder nvidia_x11.version "391" then
((nvidiaForKernel pkgs.pkgsi686Linux.linuxPackages).override { libsOnly = true; kernel = null; }).out
else
(nvidiaForKernel config.boot.kernelPackages).lib32;
nvidia_x11 = let
drivers = config.services.xserver.videoDrivers;
isDeprecated = str: (hasPrefix "nvidia" str) && (str != "nvidia");
hasDeprecated = drivers: any isDeprecated drivers;
in if (hasDeprecated drivers) then
throw ''
Selecting an nvidia driver has been modified for NixOS 19.03. The version is now set using `hardware.nvidia.package`.
Copy link
Member

@infinisil infinisil Jan 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should show in the error message already what package the user should choose based on their previous setting. We have all the information we need to make a better error message and ease the transition for users.

Copy link
Member

@vcunat vcunat Jan 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I guess it should be fine to simply add one "legacy" example and maybe also one "beta" example.

''
else if (elem "nvidia" drivers) then cfg.package else null;

enabled = nvidia_x11 != null;

cfg = config.hardware.nvidia;

pCfg = cfg.prime;
Expand Down Expand Up @@ -149,6 +132,16 @@ in
GPUs stay awake even during headless mode.
'';
};

hardware.nvidia.package = lib.mkOption {
type = lib.types.package;
Copy link
Member

@infinisil infinisil Nov 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lib is already with'd above.

Copy link
Member

@infinisil infinisil Jan 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was not addressed, but it's just a nitpick. What I meant is that you can replace type = lib.types.package with type = types.package

Copy link
Member Author

@FRidh FRidh Jan 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know, I just think we should keep the lib prefix.

Copy link
Member

@infinisil infinisil Jan 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh why? I know some people don't like with, but either we use it for the whole file or not at all. I wouldn't mind either, but this mixed style is odd.

Copy link
Contributor

@billksun billksun Jan 16, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any resolution to this?

default = config.boot.kernelPackages.nvidiaPackages.stable;
defaultText = "config.boot.kernelPackages.nvidiaPackages.stable";
description = ''
The NVIDIA X11 derivation to use.
'';
example = "config.boot.kernelPackages.nvidiaPackages.legacy340";
};
};

config = mkIf enabled {
Expand Down Expand Up @@ -228,9 +221,9 @@ in
};

hardware.opengl.package = mkIf (!offloadCfg.enable) nvidia_x11.out;
hardware.opengl.package32 = mkIf (!offloadCfg.enable) nvidia_libs32;
hardware.opengl.package32 = mkIf (!offloadCfg.enable) nvidia_x11.lib32;
hardware.opengl.extraPackages = optional offloadCfg.enable nvidia_x11.out;
hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_libs32;
hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_x11.lib32;

environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ]
++ filter (p: p != null) [ nvidia_x11.persistenced ];
Expand Down
16 changes: 11 additions & 5 deletions pkgs/os-specific/linux/nvidia-x11/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
{ lib, callPackage, fetchpatch, fetchurl, stdenv }:
{ lib, callPackage, fetchpatch, fetchurl, stdenv, pkgsi686Linux }:

let

generic = args:
if ((!lib.versionOlder args.version "391")
generic = args: let
imported = import ./generic.nix args;
in if ((!lib.versionOlder args.version "391")
&& stdenv.hostPlatform.system != "x86_64-linux") then null
else callPackage (import ./generic.nix args) { };
else callPackage imported {
lib32 = (pkgsi686Linux.callPackage imported {
libsOnly = true;
kernel = null;
}).out;
};

kernel = callPackage # a hacky way of extracting parameters from callPackage
({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { };

Expand Down
4 changes: 4 additions & 0 deletions pkgs/os-specific/linux/nvidia-x11/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
, # don't include the bundled 32-bit libraries on 64-bit platforms,
# even if it’s in downloaded binary
disable32Bit ? false
# 32 bit libs only version of this package
, lib32 ? null
}:

with stdenv.lib;
Expand Down Expand Up @@ -89,6 +91,8 @@ let
withGtk3 = !preferGtk2;
};
persistenced = mapNullable (hash: callPackage (import ./persistenced.nix self hash) { }) persistencedSha256;
} // optionalAttrs (!i686bundled) {
inherit lib32;
};

meta = with stdenv.lib; {
Expand Down