BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #124691 from SFrijters/wine-6.9

Browse source
This commit is contained in:
Sandro 2021-05-30 04:04:23 +02:00 committed by GitHub
commit 27aa13c55b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/misc/emulators/wine/sources.nix
View file

@ -44,9 +44,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "6.7";
version = "6.9";
url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz";
sha256 = "sha256-wwUUt3YdRhFRSuAhyx41QSjXfv9UooPxQB7nAid7vqQ=";
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-fWriizSk2+U7Mpn6w/Dlrevd4vc5MnlSWSGxQDf2p+M=";
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 {

8
pkgs/tools/audio/yabridge/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, substituteAll
, meson
, ninja
@ -79,6 +80,13 @@ in stdenv.mkDerivation rec {
)'';
patches = [
# Fix for wine 6.8+ (remove patch in next release):
(fetchpatch {
url = "https://github.com/robbert-vdh/yabridge/commit/5577c4bfd842c60a8ae8ce2889bbfeb53a51c62b.patch";
sha256 = "sha256-bTT08iWwDBVqi2PZPa7oal7/MqVu8t2Bh1gpjFMqLvQ=";
excludes = [ "CHANGELOG.md" ];
})
# Hard code wine path so wine version is correct in logs
(substituteAll {
src = ./hardcode-wine.patch;