diff options
author | Pierre Bourdon <delroth@gmail.com> | 2020-03-16 09:21:15 +0100 |
---|---|---|
committer | Pierre Bourdon <delroth@gmail.com> | 2020-04-20 03:19:41 +0200 |
commit | 1b89bffcf47dc1e271bea128635e33efd9481b93 (patch) | |
tree | 6aec5eef57fdc9d1884097d289ab829eaf33bc2c /nixos/modules | |
parent | a2d9f5843336b00398542448321a497309907d05 (diff) | |
download | nixlib-1b89bffcf47dc1e271bea128635e33efd9481b93.tar nixlib-1b89bffcf47dc1e271bea128635e33efd9481b93.tar.gz nixlib-1b89bffcf47dc1e271bea128635e33efd9481b93.tar.bz2 nixlib-1b89bffcf47dc1e271bea128635e33efd9481b93.tar.lz nixlib-1b89bffcf47dc1e271bea128635e33efd9481b93.tar.xz nixlib-1b89bffcf47dc1e271bea128635e33efd9481b93.tar.zst nixlib-1b89bffcf47dc1e271bea128635e33efd9481b93.zip |
libtxc_dxtn{,_s2tc}: remove from nixpkgs + hardware.opengl options
Context: discussion in https://github.com/NixOS/nixpkgs/pull/82630 Mesa has been supporting S3TC natively without requiring these libraries since the S3TC patent expired in December 2017.
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; }; |