wineUnstable: use own set of patches

Contain important hotfixes from wine's master and staging master.
This commit is contained in:
Alexander V. Nikolaev 2020-11-24 22:02:46 +02:00
parent 9144ebaf1e
commit 626f931022

View File

@ -48,15 +48,28 @@ in rec {
url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz"; url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz";
sha256 = "sha256-Cb0GyHyMl05q00UHzsh11yF+tW/Anfg41UU+DrvOTSE="; sha256 = "sha256-Cb0GyHyMl05q00UHzsh11yF+tW/Anfg41UU+DrvOTSE=";
inherit (stable) mono gecko32 gecko64; inherit (stable) mono gecko32 gecko64;
patches = [
# Also look for root certificates at $NIX_SSL_CERT_FILE
./cert-path.patch
# Hotfix picked from master for https://bugs.winehq.org/show_bug.cgi?id=50163
(pkgs.fetchpatch {
url = "https://bugs.winehq.org/attachment.cgi?id=68680";
sha256 = "sha256-GTPQhRWeu6DPadqgFiuVUjI6MzJPaTN4l//8DSG6hpo=";
})
];
}; };
staging = fetchFromGitHub rec { staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases # https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version; inherit (unstable) version;
sha256 = "sha256-witIBZB8LRNSGTbBB7Rkm9QGvkH4EMuLc6gUpcqVVGo="; sha256 = "sha256-HzAKLPlybO1lrkHo4Q1Y9H0vmjiqo9HiT05TcX08Ubk=";
owner = "wine-staging"; owner = "wine-staging";
repo = "wine-staging"; repo = "wine-staging";
rev = "v${version}"; #rev = "v${version}"; # revert back to this statement on next release
# Include hotfix for https://bugs.winehq.org/show_bug.cgi?id=50162
rev = "f257f37b92041fc718de04aa83ec3139b748ffa2";
# Just keep list empty, if current release haven't broken patchsets # Just keep list empty, if current release haven't broken patchsets
disabledPatchsets = [ ]; disabledPatchsets = [ ];