diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index e6c70e20e79f..15f89a329620 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -1,6 +1,7 @@ { lib , multiStdenv , fetchFromGitHub +, fetchpatch , substituteAll , meson , ninja @@ -85,6 +86,12 @@ in multiStdenv.mkDerivation rec { src = ./hardcode-wine.patch; inherit wine; }) + # Remove with next yabridge update + (fetchpatch { + name = "fix-for-wine-6.20.patch"; + url = "https://github.com/robbert-vdh/yabridge/commit/5be149cb525a638f7fc3adf84918c8239ee50ecf.patch"; + sha256 = "sha256-x/gfn4mKZIGQ4M0o/0LlZF8i8wZDx/bkwf8wp0BGDBo="; + }) ]; postPatch = '' @@ -121,8 +128,8 @@ in multiStdenv.mkDerivation rec { ]; preConfigure = '' - sed -i "214s|xcb.*|xcb_32bit_dep = winegcc.find_library('xcb', dirs: [ '${lib.getLib pkgsi686Linux.xorg.libxcb}/lib', ])|" meson.build - sed -i "192 i '${lib.getLib pkgsi686Linux.boost}/lib'," meson.build + sed -i "221s|xcb.*|xcb_32bit_dep = winegcc.find_library('xcb', dirs: [ '${lib.getLib pkgsi686Linux.xorg.libxcb}/lib', ])|" meson.build + sed -i "199 i '${lib.getLib pkgsi686Linux.boost}/lib'," meson.build ''; installPhase = ''