BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #119718 from MetaDark/yabridge

Browse source 
yabridge, yabridgectl: 3.0.2 -> 3.1.0
This commit is contained in:
Sandro 2021-04-17 19:29:21 +02:00 committed by GitHub
commit 1f5bfd92f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/tools/audio/yabridge/default.nix
View file

@ -45,25 +45,25 @@ let
# Derived from vst3.wrap # Derived from vst3.wrap
vst3 = rec { vst3 = rec {
version = "e2fbb41f28a4b311f2fc7d28e9b4330eec1802b6"; version = "3.7.2_build_28-patched";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "robbert-vdh"; owner = "robbert-vdh";
repo = "vst3sdk"; repo = "vst3sdk";
rev = version; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "sha256-4oLOa6kVB053Hrq7BBbZFdruAXuqnC944y5Kuib1F7s="; sha256 = "sha256-39pvfcg4fvf7DAbAPzEHA1ja1LFL6r88nEwNYwaDC8w=";
}; };
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "yabridge"; pname = "yabridge";
version = "3.0.2"; version = "3.1.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-3uZCYGqo9acpANy5tQl3U0LK6wuOzjQpfjHDvaPSGlI="; hash = "sha256-xvKjb+ql3WxnGHqcn3WnxunY5+s9f8Gt/n6EFSBrNdI=";
}; };
# Unpack subproject sources # Unpack subproject sources

2
pkgs/tools/audio/yabridgectl/default.nix
View file

@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec {
src = yabridge.src; src = yabridge.src;
sourceRoot = "source/tools/yabridgectl"; sourceRoot = "source/tools/yabridgectl";
cargoHash = "sha256-mSp/IH7ZB7YSOBCFwNtHLYDz7CvWo2sO9VuPdqpl/u0="; cargoHash = "sha256-TcjFaDo5IUs6Z3tgb+6jqyyrB2BLcif6Ycw++5FzuDY=";
patches = [ patches = [
# By default, yabridgectl locates libyabridge.so by using # By default, yabridgectl locates libyabridge.so by using

10
pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch
View file

@ -1,8 +1,8 @@
diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs
index c1c89cf..d7bd822 100644 index 6e05e34..656eef3 100644
--- a/tools/yabridgectl/src/config.rs --- a/tools/yabridgectl/src/config.rs
+++ b/tools/yabridgectl/src/config.rs +++ b/tools/yabridgectl/src/config.rs
@@ -23,6 +23,7 @@ use std::collections::{BTreeMap, BTreeSet}; @@ -23,6 +23,7 @@ use std::collections::{BTreeMap, BTreeSet, HashSet};
use std::env; use std::env;
use std::fmt::Display; use std::fmt::Display;
use std::fs; use std::fs;
@ -10,7 +10,7 @@ index c1c89cf..d7bd822 100644
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use which::which; use which::which;
use xdg::BaseDirectories; use xdg::BaseDirectories;
@@ -216,34 +217,24 @@ impl Config { @@ -222,34 +223,24 @@ impl Config {
} }
} }
None => { None => {
@ -56,10 +56,10 @@ index c1c89cf..d7bd822 100644
)); ));
} }
diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs
index 0db1bd4..221cdd0 100644 index ce701b8..b6b9633 100644
--- a/tools/yabridgectl/src/main.rs --- a/tools/yabridgectl/src/main.rs
+++ b/tools/yabridgectl/src/main.rs +++ b/tools/yabridgectl/src/main.rs
@@ -102,7 +102,7 @@ fn main() -> Result<()> { @@ -150,7 +150,7 @@ fn main() -> Result<()> {
.about("Path to the directory containing 'libyabridge-{vst2,vst3}.so'") .about("Path to the directory containing 'libyabridge-{vst2,vst3}.so'")
.long_about( .long_about(
"Path to the directory containing 'libyabridge-{vst2,vst3}.so'. If this \ "Path to the directory containing 'libyabridge-{vst2,vst3}.so'. If this \