about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorEvgeny Egorochkin <phreedom@yandex.ru>2013-10-19 00:40:45 +0300
committerEvgeny Egorochkin <phreedom@yandex.ru>2013-10-19 00:40:45 +0300
commit89854548e7ca16f833b3e9fe5688267dd6d0707a (patch)
treee9ab729d8786da37afa27c87a092d9383836fd97 /nixos
parenta3757a2f675127d4f6ab0c5489429fd23da39e88 (diff)
downloadnixlib-89854548e7ca16f833b3e9fe5688267dd6d0707a.tar
nixlib-89854548e7ca16f833b3e9fe5688267dd6d0707a.tar.gz
nixlib-89854548e7ca16f833b3e9fe5688267dd6d0707a.tar.bz2
nixlib-89854548e7ca16f833b3e9fe5688267dd6d0707a.tar.lz
nixlib-89854548e7ca16f833b3e9fe5688267dd6d0707a.tar.xz
nixlib-89854548e7ca16f833b3e9fe5688267dd6d0707a.tar.zst
nixlib-89854548e7ca16f833b3e9fe5688267dd6d0707a.zip
Add services.xserver.s3tcSupport option
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/x11/xserver.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 6e470e65e351..02ba680255bf 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -229,6 +229,14 @@ in
         '';
       };
 
+      s3tcSupport = mkOption {
+        default = false;
+        description = ''
+          Make S2TC via libtxc_dxtn available to OpenGL drivers. Using
+          this library may require a patent license depending on your location.
+        '';
+      };
+
       startOpenSSHAgent = mkOption {
         default = true;
         description = ''
@@ -410,7 +418,9 @@ in
       optionals (elem "nvidia" driverNames) [ "nouveau" "nvidiafb" ];
 
     environment.variables.LD_LIBRARY_PATH =
-      [ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ];
+      [ "/run/opengl-driver/lib" "/run/opengl-driver-32/lib" ]
+      ++ pkgs.lib.optional cfg.s3tcSupport "${pkgs.libtxc_dxtn}/lib"
+      ++ pkgs.lib.optional (cfg.s3tcSupport && cfg.driSupport32Bit) "${pkgs_i686.libtxc_dxtn}/lib";
 
     environment.etc =
       (optionals cfg.exportConfiguration