diff options
| author | Alexander V. Nikolaev <avn@avnik.info> | 2020-07-04 23:25:41 +0300 |
|---|---|---|
| committer | Alexander V. Nikolaev <avn@avnik.info> | 2020-07-09 13:13:06 +0300 |
| commit | ec7b6af024092a6485bde6d866e8c60d8ef453fd (patch) | |
| tree | 0137c297151285a66097d4b50db517a11f876835 /pkgs/misc | |
| parent | e79e7e17e9a06e0e9a3fc6f8729a7e81c55a1f23 (diff) | |
| download | nixpkgs-ec7b6af024092a6485bde6d866e8c60d8ef453fd.tar nixpkgs-ec7b6af024092a6485bde6d866e8c60d8ef453fd.tar.gz nixpkgs-ec7b6af024092a6485bde6d866e8c60d8ef453fd.tar.bz2 nixpkgs-ec7b6af024092a6485bde6d866e8c60d8ef453fd.tar.lz nixpkgs-ec7b6af024092a6485bde6d866e8c60d8ef453fd.tar.xz nixpkgs-ec7b6af024092a6485bde6d866e8c60d8ef453fd.tar.zst nixpkgs-ec7b6af024092a6485bde6d866e8c60d8ef453fd.zip | |
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.
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/wine/sources.nix | 3 | ||||
| -rw-r--r-- | pkgs/misc/emulators/wine/staging.nix | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 5b40aef4c2d..d30d4bcdc1c 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 0ef93ccfecd..f3b9fa30420 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 .. ''; })) // { |