yabridge, yabridgectl: 3.1.0 → 3.2.0 (#121715)
This commit is contained in:
parent
acf171303e
commit
00a4be22f7
|
@ -1,7 +1,6 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchpatch
|
|
||||||
, substituteAll
|
, substituteAll
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
|
@ -58,14 +57,14 @@ let
|
||||||
};
|
};
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "yabridge";
|
pname = "yabridge";
|
||||||
version = "3.1.0";
|
version = "3.2.0";
|
||||||
|
|
||||||
# NOTE: Also update yabridgectl's cargoHash when this is updated
|
# NOTE: Also update yabridgectl's cargoHash when this is updated
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "robbert-vdh";
|
owner = "robbert-vdh";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-xvKjb+ql3WxnGHqcn3WnxunY5+s9f8Gt/n6EFSBrNdI=";
|
hash = "sha256-UT6st0Rc6HOaObE3N+qlPZZ8U1gl/MFLU0mjFuScdes=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Unpack subproject sources
|
# Unpack subproject sources
|
||||||
|
@ -80,16 +79,6 @@ in stdenv.mkDerivation rec {
|
||||||
)'';
|
)'';
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Fix printing wine version when using absolute path (remove patches in next release):
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/robbert-vdh/yabridge/commit/2aadf5256b3eafeb86efa8626247972dd33baa13.patch";
|
|
||||||
sha256 = "sha256-Nq9TQJxa22vJLmf+USyPBkF8cKyEzb1Lp2Rx86pDxnY=";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/robbert-vdh/yabridge/commit/93df3fa1da6ffcc69a5b384ba04e3da7c5ef23ef.patch";
|
|
||||||
sha256 = "sha256-//8Dxolqe6n+aFo4yVnnMR9kSq/iEFE0qZPvcIBehvI=";
|
|
||||||
})
|
|
||||||
|
|
||||||
# Hard code wine path so wine version is correct in logs
|
# Hard code wine path so wine version is correct in logs
|
||||||
(substituteAll {
|
(substituteAll {
|
||||||
src = ./hardcode-wine.patch;
|
src = ./hardcode-wine.patch;
|
||||||
|
@ -130,11 +119,13 @@ in stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
mkdir -p "$out/bin" "$out/lib"
|
mkdir -p "$out/bin" "$out/lib"
|
||||||
cp yabridge-group.exe{,.so} "$out/bin"
|
cp yabridge-group.exe{,.so} "$out/bin"
|
||||||
cp yabridge-host.exe{,.so} "$out/bin"
|
cp yabridge-host.exe{,.so} "$out/bin"
|
||||||
cp libyabridge-vst2.so "$out/lib"
|
cp libyabridge-vst2.so "$out/lib"
|
||||||
cp libyabridge-vst3.so "$out/lib"
|
cp libyabridge-vst3.so "$out/lib"
|
||||||
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Hard code wine path in wrapper scripts generated by winegcc
|
# Hard code wine path in wrapper scripts generated by winegcc
|
||||||
|
|
|
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
|
|
||||||
src = yabridge.src;
|
src = yabridge.src;
|
||||||
sourceRoot = "source/tools/yabridgectl";
|
sourceRoot = "source/tools/yabridgectl";
|
||||||
cargoHash = "sha256-TcjFaDo5IUs6Z3tgb+6jqyyrB2BLcif6Ycw++5FzuDY=";
|
cargoHash = "sha256-cB4Xp8pNLQRcPQ6HtVkDkLbfNSmM9yl+oRcEzcqrmkY=";
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# By default, yabridgectl locates libyabridge.so by using
|
# By default, yabridgectl locates libyabridge.so by using
|
||||||
|
|
Loading…
Reference in a new issue