From ec7b6af024092a6485bde6d866e8c60d8ef453fd Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sat, 4 Jul 2020 23:25:41 +0300
Subject: [PATCH] wineStaging: allow to blacklist patchsets from staging

Due repeatable issues with xactengine-initial patchset.
Later, `disablePatchsets` can be extended to be overridable argument
of wineStaging.
---
 pkgs/misc/emulators/wine/sources.nix | 3 +++
 pkgs/misc/emulators/wine/staging.nix | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 5b40aef4c2d2..d30d4bcdc1c2 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -52,6 +52,9 @@ in rec {
     owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";
+
+    # Just keep list empty, if current release haven't broken patchsets
+    disabledPatchsets = [ "xactengine-initial" ];
   };
 
   winetricks = fetchFromGitHub rec {
diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix
index 0ef93ccfecd4..f3b9fa304204 100644
--- a/pkgs/misc/emulators/wine/staging.nix
+++ b/pkgs/misc/emulators/wine/staging.nix
@@ -18,7 +18,7 @@ in assert stdenv.lib.getVersion wineUnstable == patch.version;
     chmod +w patches
     cd patches
     patchShebangs gitapply.sh
-    ./patchinstall.sh DESTDIR="$PWD/.." --all
+    ./patchinstall.sh DESTDIR="$PWD/.." --all ${stdenv.lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets}
     cd ..
   '';
 })) // {