diff options
author | Alexander V. Nikolaev <avn@avnik.info> | 2020-11-24 22:02:46 +0200 |
---|---|---|
committer | Alexander V. Nikolaev <avn@avnik.info> | 2020-11-24 23:10:38 +0200 |
commit | 626f931022580d5afea8281f12a31d375fefb631 (patch) | |
tree | 8f1871500c07b469e46b0b06bdb8e48d7dd35c99 /pkgs/misc/emulators/wine/sources.nix | |
parent | 9144ebaf1e4bb906218894d9954a2ecf0bbf1073 (diff) | |
download | nixpkgs-626f931022580d5afea8281f12a31d375fefb631.tar nixpkgs-626f931022580d5afea8281f12a31d375fefb631.tar.gz nixpkgs-626f931022580d5afea8281f12a31d375fefb631.tar.bz2 nixpkgs-626f931022580d5afea8281f12a31d375fefb631.tar.lz nixpkgs-626f931022580d5afea8281f12a31d375fefb631.tar.xz nixpkgs-626f931022580d5afea8281f12a31d375fefb631.tar.zst nixpkgs-626f931022580d5afea8281f12a31d375fefb631.zip |
wineUnstable: use own set of patches
Contain important hotfixes from wine's master and staging master.
Diffstat (limited to 'pkgs/misc/emulators/wine/sources.nix')
-rw-r--r-- | pkgs/misc/emulators/wine/sources.nix | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 5abfab2691d..4b16e78cd73 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -48,15 +48,28 @@ in rec { url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz"; sha256 = "sha256-Cb0GyHyMl05q00UHzsh11yF+tW/Anfg41UU+DrvOTSE="; 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 { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-witIBZB8LRNSGTbBB7Rkm9QGvkH4EMuLc6gUpcqVVGo="; + sha256 = "sha256-HzAKLPlybO1lrkHo4Q1Y9H0vmjiqo9HiT05TcX08Ubk="; owner = "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 disabledPatchsets = [ ]; |