diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-19 09:13:54 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-19 09:13:54 +0000 |
| commit | 220273ccc689041667ab5ff55fe5b1e93689227a (patch) | |
| tree | d1c95664832920b476ab48ab5dd9ad09ec67d82d /nixpkgs/nixos/modules/hardware/video | |
| parent | 68bab940e926ec7ae7380947a78c581e6aadcd18 (diff) | |
| parent | 6e3ee8957637a60f5072e33d78e05c0f65c54366 (diff) | |
| download | nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar.gz nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar.bz2 nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar.lz nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar.xz nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.tar.zst nixlib-220273ccc689041667ab5ff55fe5b1e93689227a.zip | |
Merge commit '6e3ee8957637a60f5072e33d78e05c0f65c54366'
Conflicts: nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
Diffstat (limited to 'nixpkgs/nixos/modules/hardware/video')
| -rw-r--r-- | nixpkgs/nixos/modules/hardware/video/nvidia.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nixpkgs/nixos/modules/hardware/video/nvidia.nix b/nixpkgs/nixos/modules/hardware/video/nvidia.nix index c0ba60e49a73..a81220a92a1b 100644 --- a/nixpkgs/nixos/modules/hardware/video/nvidia.nix +++ b/nixpkgs/nixos/modules/hardware/video/nvidia.nix @@ -285,8 +285,12 @@ in hardware.opengl.package = mkIf (!offloadCfg.enable) nvidia_x11.out; 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_x11.lib32; + hardware.opengl.extraPackages = [ + pkgs.nvidia-vaapi-driver + ] ++ optional offloadCfg.enable nvidia_x11.out; + hardware.opengl.extraPackages32 = [ + pkgs.pkgsi686Linux.nvidia-vaapi-driver + ] ++ optional offloadCfg.enable nvidia_x11.lib32; environment.systemPackages = [ nvidia_x11.bin ] ++ optionals cfg.nvidiaSettings [ nvidia_x11.settings ] |