diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2018-03-17 18:52:42 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2018-03-26 14:01:49 +0300 |
| commit | 0934c8f49ba47aaba691417e5fcc15383c3f9929 (patch) | |
| tree | dd243197778322c139e73a60105ec1db1036127f /nixos/modules/hardware | |
| parent | f362cf23d791c417e6fb33b69fae039215a88077 (diff) | |
| download | nixlib-0934c8f49ba47aaba691417e5fcc15383c3f9929.tar nixlib-0934c8f49ba47aaba691417e5fcc15383c3f9929.tar.gz nixlib-0934c8f49ba47aaba691417e5fcc15383c3f9929.tar.bz2 nixlib-0934c8f49ba47aaba691417e5fcc15383c3f9929.tar.lz nixlib-0934c8f49ba47aaba691417e5fcc15383c3f9929.tar.xz nixlib-0934c8f49ba47aaba691417e5fcc15383c3f9929.tar.zst nixlib-0934c8f49ba47aaba691417e5fcc15383c3f9929.zip | |
nvidia service: rely on libglvnd
Diffstat (limited to 'nixos/modules/hardware')
| -rw-r--r-- | nixos/modules/hardware/video/nvidia.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index eafc9869315a..4a7d6da286ba 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -27,13 +27,6 @@ let nvidia_x11 = nvidiaForKernel config.boot.kernelPackages; nvidia_libs32 = (nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; }; - nvidiaPackage = nvidia: pkgs: - if !nvidia.useGLVND then nvidia.out - else pkgs.buildEnv { - name = "nvidia-libs"; - paths = [ pkgs.libglvnd nvidia.out ]; - }; - enabled = nvidia_x11 != null; in @@ -59,8 +52,8 @@ in source = "${nvidia_x11.bin}/share/nvidia/nvidia-application-profiles-rc"; }; - hardware.opengl.package = nvidiaPackage nvidia_x11 pkgs; - hardware.opengl.package32 = nvidiaPackage nvidia_libs32 pkgs_i686; + hardware.opengl.package = nvidia_x11.out; + hardware.opengl.package32 = nvidia_libs32.out; environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ] ++ lib.filter (p: p != null) [ nvidia_x11.persistenced ]; |