diff options
| author | critbase <12738442+critbase@users.noreply.github.com> | 2021-08-11 21:49:55 -0400 |
|---|---|---|
| committer | critbase <12738442+critbase@users.noreply.github.com> | 2021-08-11 22:12:46 -0400 |
| commit | 360ec7f9f291c08e248544e2834fa2efe80b4edb (patch) | |
| tree | 421f7105b3532474975b1dfcc2d4305c7c632755 /pkgs/tools/audio | |
| parent | c395dc58dfcd0505e145ed78aefb8cac5e4b24db (diff) | |
| download | nixpkgs-360ec7f9f291c08e248544e2834fa2efe80b4edb.tar nixpkgs-360ec7f9f291c08e248544e2834fa2efe80b4edb.tar.gz nixpkgs-360ec7f9f291c08e248544e2834fa2efe80b4edb.tar.bz2 nixpkgs-360ec7f9f291c08e248544e2834fa2efe80b4edb.tar.lz nixpkgs-360ec7f9f291c08e248544e2834fa2efe80b4edb.tar.xz nixpkgs-360ec7f9f291c08e248544e2834fa2efe80b4edb.tar.zst nixpkgs-360ec7f9f291c08e248544e2834fa2efe80b4edb.zip | |
yabridge: 3.3.1 -> 3.5.2
Diffstat (limited to 'pkgs/tools/audio')
| -rw-r--r-- | pkgs/tools/audio/yabridge/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/tools/audio/yabridge/hardcode-wine.patch | 6 |
2 files changed, 16 insertions, 9 deletions
diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index cbe35765cb4..ac5767b2421 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, multiStdenv , fetchFromGitHub , substituteAll , meson @@ -8,6 +8,7 @@ , wine , boost , libxcb +, pkgsi686Linux }: let @@ -55,16 +56,16 @@ let sha256 = "sha256-39pvfcg4fvf7DAbAPzEHA1ja1LFL6r88nEwNYwaDC8w="; }; }; -in stdenv.mkDerivation rec { +in multiStdenv.mkDerivation rec { pname = "yabridge"; - version = "3.3.1"; + version = "3.5.2"; # NOTE: Also update yabridgectl's cargoHash when this is updated src = fetchFromGitHub { owner = "robbert-vdh"; repo = pname; rev = version; - hash = "sha256-3B+6YuCWVJljqdyGpePjPf5JDwLSWFNgOCeLt8e4mO8="; + hash = "sha256-SLiksc8lQo2A5sefKbcaJyhi8vPdp2p2Jbc7bvM0sDw="; }; # Unpack subproject sources @@ -109,6 +110,7 @@ in stdenv.mkDerivation rec { mesonFlags = [ "--cross-file" "cross-wine.conf" + "-Dwith-bitbridge=true" # Requires CMake and is unnecessary "-Dtomlplusplus:GENERATE_CMAKE_CONFIG=disabled" @@ -118,11 +120,16 @@ in stdenv.mkDerivation rec { "-Dtomlplusplus:BUILD_TESTS=disabled" ]; + 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 + ''; + installPhase = '' runHook preInstall mkdir -p "$out/bin" "$out/lib" - cp yabridge-group.exe{,.so} "$out/bin" - cp yabridge-host.exe{,.so} "$out/bin" + cp yabridge-group*.exe{,.so} "$out/bin" + cp yabridge-host*.exe{,.so} "$out/bin" cp libyabridge-vst2.so "$out/lib" cp libyabridge-vst3.so "$out/lib" runHook postInstall diff --git a/pkgs/tools/audio/yabridge/hardcode-wine.patch b/pkgs/tools/audio/yabridge/hardcode-wine.patch index 2b6ce1f448f..d58aedeb27f 100644 --- a/pkgs/tools/audio/yabridge/hardcode-wine.patch +++ b/pkgs/tools/audio/yabridge/hardcode-wine.patch @@ -1,13 +1,13 @@ diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp -index 1ff05bc..0723456 100644 +index 7fb7d1b3..eb227101 100644 --- a/src/plugin/utils.cpp +++ b/src/plugin/utils.cpp -@@ -351,7 +351,7 @@ std::string get_wine_version() { +@@ -105,5 +105,5 @@ std::string PluginInfo::wine_version() const { access(wineloader_path.c_str(), X_OK) == 0) { wine_path = wineloader_path; } else { - wine_path = bp::search_path("wine").string(); + wine_path = "@wine@/bin/wine"; } - + bp::ipstream output; |