diff options
| author | Kira Bruneau <kira.bruneau@pm.me> | 2021-05-28 18:11:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-28 18:11:08 -0400 |
| commit | 00a4be22f7f9d731ccc1f2c5687f29bcbbf41bea (patch) | |
| tree | 9278273dc1164315665b9bff9ef901c1d30146d0 /pkgs/tools/audio | |
| parent | acf171303eb625776d21f8a3366b911d4d1c2e75 (diff) | |
| download | nixpkgs-00a4be22f7f9d731ccc1f2c5687f29bcbbf41bea.tar nixpkgs-00a4be22f7f9d731ccc1f2c5687f29bcbbf41bea.tar.gz nixpkgs-00a4be22f7f9d731ccc1f2c5687f29bcbbf41bea.tar.bz2 nixpkgs-00a4be22f7f9d731ccc1f2c5687f29bcbbf41bea.tar.lz nixpkgs-00a4be22f7f9d731ccc1f2c5687f29bcbbf41bea.tar.xz nixpkgs-00a4be22f7f9d731ccc1f2c5687f29bcbbf41bea.tar.zst nixpkgs-00a4be22f7f9d731ccc1f2c5687f29bcbbf41bea.zip | |
yabridge, yabridgectl: 3.1.0 → 3.2.0 (#121715)
Diffstat (limited to 'pkgs/tools/audio')
| -rw-r--r-- | pkgs/tools/audio/yabridge/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/tools/audio/yabridgectl/default.nix | 2 |
2 files changed, 5 insertions, 14 deletions
diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index 375ce985819..048cac40972 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , substituteAll , meson , ninja @@ -58,14 +57,14 @@ let }; in stdenv.mkDerivation rec { pname = "yabridge"; - version = "3.1.0"; + version = "3.2.0"; # NOTE: Also update yabridgectl's cargoHash when this is updated src = fetchFromGitHub { owner = "robbert-vdh"; repo = pname; rev = version; - hash = "sha256-xvKjb+ql3WxnGHqcn3WnxunY5+s9f8Gt/n6EFSBrNdI="; + hash = "sha256-UT6st0Rc6HOaObE3N+qlPZZ8U1gl/MFLU0mjFuScdes="; }; # Unpack subproject sources @@ -80,16 +79,6 @@ in stdenv.mkDerivation rec { )''; 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 (substituteAll { src = ./hardcode-wine.patch; @@ -130,11 +119,13 @@ in stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall mkdir -p "$out/bin" "$out/lib" 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 ''; # Hard code wine path in wrapper scripts generated by winegcc diff --git a/pkgs/tools/audio/yabridgectl/default.nix b/pkgs/tools/audio/yabridgectl/default.nix index 4f88e58f0af..4f738310d85 100644 --- a/pkgs/tools/audio/yabridgectl/default.nix +++ b/pkgs/tools/audio/yabridgectl/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = yabridge.src; sourceRoot = "source/tools/yabridgectl"; - cargoHash = "sha256-TcjFaDo5IUs6Z3tgb+6jqyyrB2BLcif6Ycw++5FzuDY="; + cargoHash = "sha256-cB4Xp8pNLQRcPQ6HtVkDkLbfNSmM9yl+oRcEzcqrmkY="; patches = [ # By default, yabridgectl locates libyabridge.so by using |