commit ca7c52c4f514952d9cb70a20364f93f1a84e8b49 · pyrox.dev/nixpkgs

+1 -2

nixos/modules/hardware/video/nvidia.nix

···

       462
       462
        
           boot.kernelParams = optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1"

     

       463
       463
        
             ++ optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1"

     

       464
       464
        
             ++ optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1"

     

       465
       465
       -
             # proprietary driver is not compiled with support for X86_KERNEL_IBT

     

       466
       466
       -
             ++ optional (!cfg.open && config.boot.kernelPackages.kernel.kernelAtLeast "6.2") "ibt=off";

     

       465
       465
       +
             ++ optional (!cfg.open && config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && lib.versionOlder nvidia_x11.version "530") "ibt=off";

     

       467
       466
        
       

     

       468
       467
        
           services.udev.extraRules =

     

       469
       468
        
             ''

+1 -1

pkgs/os-specific/linux/nvidia-x11/builder.sh

···

       3
       3
        
       

     

       4
       4
        
       unpackManually() {

     

       5
       5
        
           skip=$(sed 's/^skip=//; t; d' $src)

     

       6
       6
       -
           tail -n +$skip $src | xz -d | tar xvf -

     

       6
       6
       +
           tail -n +$skip $src | bsdtar xvf -

     

       7
       7
        
           sourceRoot=.

     

       8
       8
        
       }

     

       9
       9

+10 -10

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

···

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         latest = selectHighestVersion production (generic {

     

       36
       36
       -
           version = "520.56.06";

     

       37
       37
       -
           sha256_64bit = "sha256-UWdLAL7Wdm7EPUHKhNGNaTkGI0+FUZBptqNB92wRPEY=";

     

       38
       38
       -
           openSha256 = "sha256-miIxF/0fA7v8fU+oh/mx0DRqJdPBzmz14IqgPWJQeKU=";

     

       39
       39
       -
           settingsSha256 = "sha256-NeT3tb7NGicKHnNkuOwbte6BJsP1bUzPSE+TXnevCAM=";

     

       40
       40
       -
           persistencedSha256 = "sha256-3nWtnwpLaal3ty8GNMFa4zeonT8nKpYs6DIgsAq9+84=";

     

       36
       36
       +
           version = "530.41.03";

     

       37
       37
       +
           sha256_64bit = "sha256-riehapaMhVA/XRYd2jQ8FgJhKwJfSu4V+S4uoKy3hLE=";

     

       38
       38
       +
           openSha256 = "sha256-etbtw6LMRUcFoZC9EDDRrTDekV8JFRYmkp3idLaMk5g=";

     

       39
       39
       +
           settingsSha256 = "sha256-8KB6T9f+gWl8Ni+uOyrJKiiH5mNx9eyfCcW/RjPTQQA=";

     

       40
       40
       +
           persistencedSha256 = "sha256-zrstlt/0YVGnsPGUuBbR9ULutywi2wNDVxh7OhJM7tM=";

     

       41
       41
        
         });

     

       42
       42
        
       

     

       43
       43
        
         beta = selectHighestVersion latest (generic {

     

       44
       44
       -
           version = "525.53";

     

       45
       45
       -
           sha256_64bit = "sha256-dLsJcfBPHd3TxGQciRcG+5bo3lLiL2B55Q3nbTpRaH8=";

     

       46
       46
       -
           openSha256 = "sha256-XA5RY+dQZv+dTHF7rm/bXnPZLj1G75PJKSTfREpuKag=";

     

       47
       47
       -
           settingsSha256 = "sha256-N3+EOm2D2NSmD/cai+Pm2z5WHmV+GEJVr9KTQv/7j88=";

     

       48
       48
       -
           persistencedSha256 = "sha256-AhB6zetbejQzajg76+hqpbfv3OzftueXGpviepH/xss=";

     

       44
       44
       +
           version = "530.30.02";

     

       45
       45
       +
           sha256_64bit = "sha256-R/3bvXoiumYZI9vObn9R7sVN9oBQxAbMBJDDv77eeWM=";

     

       46
       46
       +
           openSha256 = "sha256-LCtTyuJ8s8isTBt9HetItLqSjL1GOn0tPUarjuxHpMk=";

     

       47
       47
       +
           settingsSha256 = "sha256-6mynLNSaWeiB52HdwZ0EQNyPg+tuat0oEqpZGSb2yQo=";

     

       48
       48
       +
           persistencedSha256 = "sha256-h6iq0iD9F41a7s6jWKPTI+oVzgDRIr1Kk97LNH9rg7E=";

     

       49
       49
        
         });

     

       50
       50
        
       

     

       51
       51
        
         # Vulkan developer beta driver

+2 -3

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

···

       20
       20
        
       }@args:

     

       21
       21
        
       

     

       22
       22
        
       { lib, stdenv, callPackage, pkgs, pkgsi686Linux, fetchurl

     

       23
       23
       -
       , kernel ? null, perl, nukeReferences, which

     

       23
       23
       +
       , kernel ? null, perl, nukeReferences, which, libarchive

     

       24
       24
        
       , # Whether to build the libraries only (i.e. not the kernel module or

     

       25
       25
        
         # nvidia-settings).  Used to support 32-bit binaries on 64-bit

     

       26
       26
        
         # Linux.

     
···

       98
       98
        
           libPath = libPathFor pkgs;

     

       99
       99
        
           libPath32 = optionalString i686bundled (libPathFor pkgsi686Linux);

     

       100
       100
        
       

     

       101
       101
       -
           buildInputs = [ which ];

     

       102
       102
       -
           nativeBuildInputs = [ perl nukeReferences ]

     

       101
       101
       +
           nativeBuildInputs = [ perl nukeReferences which libarchive ]

     

       103
       102
        
             ++ optionals (!libsOnly) kernel.moduleBuildDependencies;

     

       104
       103
        
       

     

       105
       104
        
           disallowedReferences = optionals (!libsOnly) [ kernel.dev ];