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 /pkgs/misc/emulators | |
| 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 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/wine/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/staging.nix | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 727eb2700671..368e2845ca40 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -9,7 +9,6 @@ { lib, stdenv, callPackage, wineRelease ? "stable", wineBuild ? if stdenv.hostPlatform.system == "x86_64-linux" then "wineWow" else "wine32", - libtxc_dxtn_Name ? "libtxc_dxtn_s2tc", pngSupport ? false, jpegSupport ? false, tiffSupport ? false, @@ -63,7 +62,6 @@ let wine-build = build: release: in if wineRelease == "staging" then callPackage ./staging.nix { - inherit libtxc_dxtn_Name; wineUnstable = wine-build wineBuild "unstable"; } else diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index df979c68a47f..5c2469f8f44e 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, wineUnstable, libtxc_dxtn_Name }: +{ stdenv, callPackage, wineUnstable }: with callPackage ./util.nix {}; @@ -8,7 +8,7 @@ let patch = (callPackage ./sources.nix {}).staging; in assert stdenv.lib.getVersion wineUnstable == patch.version; stdenv.lib.overrideDerivation wineUnstable (self: { - buildInputs = build-inputs [ "perl" "utillinux" "autoconf" libtxc_dxtn_Name ] self.buildInputs; + buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs; name = "${self.name}-staging"; |