about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2020-03-16 09:21:15 +0100
committerPierre Bourdon <delroth@gmail.com>2020-04-20 03:19:41 +0200
commit1b89bffcf47dc1e271bea128635e33efd9481b93 (patch)
tree6aec5eef57fdc9d1884097d289ab829eaf33bc2c /pkgs/top-level
parenta2d9f5843336b00398542448321a497309907d05 (diff)
downloadnixlib-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 'pkgs/top-level')
-rw-r--r--pkgs/top-level/aliases.nix2
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6ebf2bcf8df7..d645edaff7c1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -244,6 +244,8 @@ mapAliases ({
   librecad2 = librecad;  # backwards compatibility alias, added 2015-10
   libsysfs = sysfsutils; # added 2018-04-25
   libtidy = html-tidy;  # added 2014-12-21
+  libtxc_dxtn = throw "removed 2020-03-16, now integrated in Mesa";
+  libtxc_dxtn_s2tc = throw "removed 2020-03-16, now integrated in Mesa";
   libudev = udev; # added 2018-04-25
   libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10
   links = links2; # added 2016-01-31
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad4bb9f8a97e..c705c7ae3af1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13272,10 +13272,6 @@ in
 
   libtsm = callPackage ../development/libraries/libtsm { };
 
-  libtxc_dxtn = callPackage ../development/libraries/libtxc_dxtn { };
-
-  libtxc_dxtn_s2tc = callPackage ../development/libraries/libtxc_dxtn_s2tc { };
-
   libgeotiff = callPackage ../development/libraries/libgeotiff { };
 
   libu2f-host = callPackage ../development/libraries/libu2f-host { };