commit 161b9b24365cff3c94f1c2d3eb5a5e13c722d04a · pyrox.dev/nixpkgs

+21 -30

nixos/modules/hardware/video/nvidia.nix

···

       5
       5
        
       with lib;

     

       6
       6
        
       

     

       7
       7
        
       let

     

       8
       8
       -
       

     

       9
       9
       -
         drivers = config.services.xserver.videoDrivers;

     

       10
       10
       -
       

     

       11
       11
       -
         # FIXME: should introduce an option like

     

       12
       12
       -
         # ‘hardware.video.nvidia.package’ for overriding the default NVIDIA

     

       13
       13
       -
         # driver.

     

       14
       14
       -
         nvidiaForKernel = kernelPackages:

     

       15
       15
       -
           if elem "nvidia" drivers then

     

       16
       16
       -
               kernelPackages.nvidia_x11

     

       17
       17
       -
           else if elem "nvidiaBeta" drivers then

     

       18
       18
       -
               kernelPackages.nvidia_x11_beta

     

       19
       19
       -
           else if elem "nvidiaVulkanBeta" drivers then

     

       20
       20
       -
               kernelPackages.nvidia_x11_vulkan_beta

     

       21
       21
       -
           else if elem "nvidiaLegacy304" drivers then

     

       22
       22
       -
             kernelPackages.nvidia_x11_legacy304

     

       23
       23
       -
           else if elem "nvidiaLegacy340" drivers then

     

       24
       24
       -
             kernelPackages.nvidia_x11_legacy340

     

       25
       25
       -
           else if elem "nvidiaLegacy390" drivers then

     

       26
       26
       -
             kernelPackages.nvidia_x11_legacy390

     

       27
       27
       -
           else null;

     

       28
       28
       -
       

     

       29
       29
       -
         nvidia_x11 = nvidiaForKernel config.boot.kernelPackages;

     

       30
       30
       -
         nvidia_libs32 =

     

       31
       31
       -
           if versionOlder nvidia_x11.version "391" then

     

       32
       32
       -
             ((nvidiaForKernel pkgs.pkgsi686Linux.linuxPackages).override { libsOnly = true; kernel = null; }).out

     

       33
       33
       -
           else

     

       34
       34
       -
             (nvidiaForKernel config.boot.kernelPackages).lib32;

     

       8
       8
       +
         nvidia_x11 = let

     

       9
       9
       +
           drivers = config.services.xserver.videoDrivers;

     

       10
       10
       +
           isDeprecated = str: (hasPrefix "nvidia" str) && (str != "nvidia");

     

       11
       11
       +
           hasDeprecated = drivers: any isDeprecated drivers;

     

       12
       12
       +
         in if (hasDeprecated drivers) then

     

       13
       13
       +
           throw ''

     

       14
       14
       +
             Selecting an nvidia driver has been modified for NixOS 19.03. The version is now set using `hardware.nvidia.package`.

     

       15
       15
       +
           ''

     

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

     

       35
       17
        
       

     

       36
       18
        
         enabled = nvidia_x11 != null;

     

       37
       37
       -
       

     

       38
       19
        
         cfg = config.hardware.nvidia;

     

       39
       20
        
       

     

       40
       21
        
         pCfg = cfg.prime;

     
···

       170
       151
        
               GPUs stay awake even during headless mode.

     

       171
       152
        
             '';

     

       172
       153
        
           };

     

       154
       154
       +
       

     

       155
       155
       +
           hardware.nvidia.package = lib.mkOption {

     

       156
       156
       +
             type = lib.types.package;

     

       157
       157
       +
             default = config.boot.kernelPackages.nvidiaPackages.stable;

     

       158
       158
       +
             defaultText = "config.boot.kernelPackages.nvidiaPackages.stable";

     

       159
       159
       +
             description = ''

     

       160
       160
       +
               The NVIDIA X11 derivation to use.

     

       161
       161
       +
             '';

     

       162
       162
       +
             example = "config.boot.kernelPackages.nvidiaPackages.legacy340";

     

       163
       163
       +
           };

     

       173
       164
        
         };

     

       174
       165
        
       

     

       175
       166
        
         config = let

     
···

       271
       262
        
           };

     

       272
       263
        
       

     

       273
       264
        
           hardware.opengl.package = mkIf (!offloadCfg.enable) nvidia_x11.out;

     

       274
       274
       -
           hardware.opengl.package32 = mkIf (!offloadCfg.enable) nvidia_libs32;

     

       265
       265
       +
           hardware.opengl.package32 = mkIf (!offloadCfg.enable) nvidia_x11.lib32;

     

       275
       266
        
           hardware.opengl.extraPackages = optional offloadCfg.enable nvidia_x11.out;

     

       276
       276
       -
           hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_libs32;

     

       267
       267
       +
           hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_x11.lib32;

     

       277
       268
        
       

     

       278
       269
        
           environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ]

     

       279
       270
        
             ++ optionals nvidiaPersistencedEnabled [ nvidia_x11.persistenced ];

+11 -5

pkgs/os-specific/linux/nvidia-x11/default.nix

···

       1
       1
       -
       { lib, callPackage, fetchpatch, fetchurl, stdenv }:

     

       1
       1
       +
       { lib, callPackage, fetchpatch, fetchurl, stdenv, pkgsi686Linux }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
       

     

       5
       5
       -
       generic = args:

     

       6
       6
       -
       if ((!lib.versionOlder args.version "391")

     

       4
       4
       +
         generic = args: let

     

       5
       5
       +
           imported = import ./generic.nix args;

     

       6
       6
       +
         in if ((!lib.versionOlder args.version "391")

     

       7
       7
        
           && stdenv.hostPlatform.system != "x86_64-linux") then null

     

       8
       8
       -
         else callPackage (import ./generic.nix args) { };

     

       8
       8
       +
         else callPackage imported {

     

       9
       9
       +
           lib32 = (pkgsi686Linux.callPackage imported {

     

       10
       10
       +
             libsOnly = true;

     

       11
       11
       +
             kernel = null;

     

       12
       12
       +
           }).out;

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       9
       15
        
         kernel = callPackage # a hacky way of extracting parameters from callPackage

     

       10
       16
        
           ({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { };

     

       11
       17

pkgs/os-specific/linux/nvidia-x11/generic.nix

···

       25
       25
        
       , # don't include the bundled 32-bit libraries on 64-bit platforms,

     

       26
       26
        
         # even if it’s in downloaded binary

     

       27
       27
        
         disable32Bit ? false

     

       28
       28
       +
         # 32 bit libs only version of this package

     

       29
       29
       +
       , lib32 ? null

     

       28
       30
        
       }:

     

       29
       31
        
       

     

       30
       32
        
       with lib;

     
···

       93
       95
        
             };

     

       94
       96
        
             persistenced = mapNullable (hash: callPackage (import ./persistenced.nix self hash) { }) persistencedSha256;

     

       95
       97
        
             inherit persistencedVersion settingsVersion;

     

       98
       98
       +
           } // optionalAttrs (!i686bundled) {

     

       99
       99
       +
             inherit lib32;

     

       96
       100
        
           };

     

       97
       101
        
       

     

       98
       102
        
           meta = with lib; {