diff options
author | Léo Gaspard <leo@gaspard.io> | 2020-04-20 13:41:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-20 13:41:47 +0200 |
commit | 203955fa0c65301ff985e8b16a8d9f36db9cfbb0 (patch) | |
tree | 3ec26789cd1f73a2279b4eb3d4e51c7919a42d20 /nixos/modules | |
parent | 5e76bf706bfabad18d1405ff2f0ac60b3cdf1ebf (diff) | |
parent | 1b89bffcf47dc1e271bea128635e33efd9481b93 (diff) | |
download | nixlib-203955fa0c65301ff985e8b16a8d9f36db9cfbb0.tar nixlib-203955fa0c65301ff985e8b16a8d9f36db9cfbb0.tar.gz nixlib-203955fa0c65301ff985e8b16a8d9f36db9cfbb0.tar.bz2 nixlib-203955fa0c65301ff985e8b16a8d9f36db9cfbb0.tar.lz nixlib-203955fa0c65301ff985e8b16a8d9f36db9cfbb0.tar.xz nixlib-203955fa0c65301ff985e8b16a8d9f36db9cfbb0.tar.zst nixlib-203955fa0c65301ff985e8b16a8d9f36db9cfbb0.zip |
Merge pull request #82714 from delroth/s3tc
libtxc_dxtn{,_s2tc}: remove from nixpkgs + hardware.opengl options
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/hardware/opengl.nix | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index 28cddea8b79c..061528f4b1b5 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -10,14 +10,6 @@ let videoDrivers = config.services.xserver.videoDrivers; - makePackage = p: pkgs.buildEnv { - name = "mesa-drivers+txc-${p.mesa.version}"; - paths = - [ p.mesa.drivers - (if cfg.s3tcSupport then p.libtxc_dxtn else p.libtxc_dxtn_s2tc) - ]; - }; - package = pkgs.buildEnv { name = "opengl-drivers"; paths = [ cfg.package ] ++ cfg.extraPackages; @@ -34,6 +26,9 @@ in imports = [ (mkRenamedOptionModule [ "services" "xserver" "vaapiDrivers" ] [ "hardware" "opengl" "extraPackages" ]) + (mkRemovedOptionModule [ "hardware" "opengl" "s3tcSupport" ] '' + S3TC support is now always enabled in Mesa. + '') ]; options = { @@ -74,17 +69,6 @@ in ''; }; - s3tcSupport = mkOption { - type = types.bool; - default = false; - description = '' - Make S3TC(S3 Texture Compression) via libtxc_dxtn available - to OpenGL drivers instead of the patent-free S2TC replacement. - - Using this library may require a patent license depending on your location. - ''; - }; - package = mkOption { type = types.package; internal = true; @@ -166,8 +150,8 @@ in environment.sessionVariables.LD_LIBRARY_PATH = mkIf cfg.setLdLibraryPath ([ "/run/opengl-driver/lib" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/lib"); - hardware.opengl.package = mkDefault (makePackage pkgs); - hardware.opengl.package32 = mkDefault (makePackage pkgs.pkgsi686Linux); + hardware.opengl.package = mkDefault pkgs.mesa.drivers; + hardware.opengl.package32 = mkDefault pkgs.pkgsi686Linux.mesa.drivers; boot.extraModulePackages = optional (elem "virtualbox" videoDrivers) kernelPackages.virtualboxGuestAdditions; }; |