diff --git a/pkgs/by-name/ya/yabridge/hardcode-dependencies.patch b/pkgs/by-name/ya/yabridge/hardcode-dependencies.patch index beb4766c8561..581780f1cd33 100644 --- a/pkgs/by-name/ya/yabridge/hardcode-dependencies.patch +++ b/pkgs/by-name/ya/yabridge/hardcode-dependencies.patch @@ -1,16 +1,3 @@ -diff --git a/meson.build b/meson.build -index 9e69128d..8c53ac88 100644 ---- a/meson.build -+++ b/meson.build -@@ -226,7 +226,7 @@ if is_64bit_system - xcb_64bit_dep = dependency('xcb') - endif - if with_bitbridge -- xcb_32bit_dep = winegcc.find_library('xcb') -+ xcb_32bit_dep = winegcc.find_library('xcb', dirs: ['@libxcb32@/lib']) - endif - - # These are all headers-only libraries, and thus won't require separate 32-bit diff --git a/src/common/notifications.cpp b/src/common/notifications.cpp index 654b6c83..78ba2fe7 100644 --- a/src/common/notifications.cpp diff --git a/pkgs/by-name/ya/yabridge/package.nix b/pkgs/by-name/ya/yabridge/package.nix index 0735d19ddfc5..e5f0ee796df9 100644 --- a/pkgs/by-name/ya/yabridge/package.nix +++ b/pkgs/by-name/ya/yabridge/package.nix @@ -1,9 +1,8 @@ { lib, - multiStdenv, + stdenv, fetchFromGitHub, replaceVars, - pkgsi686Linux, dbus, meson, ninja, @@ -73,7 +72,7 @@ let hash = "sha256-LsPHPoAL21XOKmF1Wl/tvLJGzjaCLjaDAcUtDvXdXSU="; }; in -multiStdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "yabridge"; version = "5.1.1"; @@ -105,7 +104,6 @@ multiStdenv.mkDerivation (finalAttrs: { # Hard code bitbridge & runtime dependencies (replaceVars ./hardcode-dependencies.patch { libdbus = dbus.lib; - libxcb32 = pkgsi686Linux.libxcb; inherit wine; }) @@ -140,7 +138,7 @@ multiStdenv.mkDerivation (finalAttrs: { mesonFlags = [ "--cross-file" "cross-wine.conf" - "-Dbitbridge=true" + "-Dbitbridge=false" # Requires CMake and is unnecessary "-Dtomlplusplus:generate_cmake_config=false" @@ -149,7 +147,7 @@ multiStdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall mkdir -p "$out/bin" "$out/lib" - cp yabridge-host{,-32}.exe{,.so} "$out/bin" + cp yabridge-host.exe{,.so} "$out/bin" cp libyabridge{,-chainloader}-{vst2,vst3,clap}.so "$out/lib" runHook postInstall '';