aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/misc/emulators/wine
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/misc/emulators/wine')
-rw-r--r--nixpkgs/pkgs/misc/emulators/wine/default.nix2
-rw-r--r--nixpkgs/pkgs/misc/emulators/wine/sources.nix4
-rw-r--r--nixpkgs/pkgs/misc/emulators/wine/staging.nix4
-rw-r--r--nixpkgs/pkgs/misc/emulators/wine/winetricks.nix1
4 files changed, 4 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/misc/emulators/wine/default.nix b/nixpkgs/pkgs/misc/emulators/wine/default.nix
index 727eb270067..368e2845ca4 100644
--- a/nixpkgs/pkgs/misc/emulators/wine/default.nix
+++ b/nixpkgs/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/nixpkgs/pkgs/misc/emulators/wine/sources.nix b/nixpkgs/pkgs/misc/emulators/wine/sources.nix
index 0e3eb2ce698..964e08674ca 100644
--- a/nixpkgs/pkgs/misc/emulators/wine/sources.nix
+++ b/nixpkgs/pkgs/misc/emulators/wine/sources.nix
@@ -56,8 +56,8 @@ in rec {
winetricks = fetchFromGitHub rec {
# https://github.com/Winetricks/winetricks/releases
- version = "20191224";
- sha256 = "07q3zh2i3xqzpg46ljarhq3a4ha9zwpc6jqzvly0kfglkh3b3v66";
+ version = "20200412";
+ sha256 = "0ccr8wdmhkhbccxs5hvn44ppl969n8j0c3rnnir5v6akjcb2nzzv";
owner = "Winetricks";
repo = "winetricks";
rev = version;
diff --git a/nixpkgs/pkgs/misc/emulators/wine/staging.nix b/nixpkgs/pkgs/misc/emulators/wine/staging.nix
index df979c68a47..5c2469f8f44 100644
--- a/nixpkgs/pkgs/misc/emulators/wine/staging.nix
+++ b/nixpkgs/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";
diff --git a/nixpkgs/pkgs/misc/emulators/wine/winetricks.nix b/nixpkgs/pkgs/misc/emulators/wine/winetricks.nix
index 444ef29b784..ab183dfd38e 100644
--- a/nixpkgs/pkgs/misc/emulators/wine/winetricks.nix
+++ b/nixpkgs/pkgs/misc/emulators/wine/winetricks.nix
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
description = "A script to install DLLs needed to work around problems in Wine";
license = stdenv.lib.licenses.lgpl21;
homepage = "https://github.com/Winetricks/winetricks";
- maintainers = with stdenv.lib.maintainers; [ the-kenny ];
platforms = with stdenv.lib.platforms; linux;
};
}