From 0cd06e8b091627dfe2921e3d8a1f26d30d135b7b Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 27 May 2021 17:05:03 +0200 Subject: [PATCH] wine{Unstable,Staging}: 6.8 -> 6.9 --- pkgs/misc/emulators/wine/sources.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 565de7ec52e0..6103472a7cc1 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,9 +44,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.8"; + version = "6.9"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "sha256-W0It3mfYQShxFSzjFYde+0lFB604oPTXEPE5OKdp69g="; + sha256 = "sha256-GFVOYB3vhqmiAXKwhcZoMpFPwh511VX25U/4nn6uW/4="; inherit (stable) gecko32 gecko64; ## see http://wiki.winehq.org/Mono @@ -65,13 +65,17 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-cuJaODJ1jDxlUG9QTIQjg4IQqK5rOZGjgdpzjd4XAHc="; + sha256 = "sha256-g0NmiypafOAmKDRoRf4uz5NnhFo6uga0fKYNCF29jbE="; owner = "wine-staging"; repo = "wine-staging"; - rev = "v${version}"; + #rev = "v${version}"; + # FIXME: replace with line above with 6.10 release + # Fix https://bugs.winehq.org/show_bug.cgi?id=51172 + rev = "5bbe3e47a559b3c04bc8791e0b398a271c772af7"; - # Just keep list empty, if current release haven't broken patchsets - disabledPatchsets = [ ]; + # Actually only "d3d11-Deferred_Context" cause problems, two others only dependencies + # see FIXME above + disabledPatchsets = [ "d3d11-Deferred_Context" "wined3d-CSMT_Main" "nvapi-Stub_DLL" "nvcuvid-CUDA_Video_Support" "nvencodeapi-Video_Encoder" ]; }; winetricks = fetchFromGitHub rec {