f001668 · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

yabridge, yabridgectl: 3.7.0 → 3.8.0

commitf001668d31a455476ec4367188a4c60aaad36a5c authorKira Bruneau <kira.bruneau@pm.me> dateSat 22 Jan 2022, 15:56 (5 years ago) parent6631973

4 files changed+20−17

compare with master

unifiedsplit

pkgs/tools/audio/yabridge/default.nix+6−6 pkgs/tools/audio/yabridge/hardcode-dependencies.patch+4−4 pkgs/tools/audio/yabridgectl/default.nix+1−1 pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch+9−6

pkgs/tools/audio/yabridge/default.nix+6−6

@@ -34,28 +34,28 @@ let

3434 tomlplusplus = fetchFromGitHub {

3535 owner = "marzer";

3636 repo = "tomlplusplus";

37− rev = "47216c8a73d77e7431ec536fb3e251aed06cc420";

38− sha256 = "sha256-cwAzWu5j3ch/56a6JmEoKCsxVNTk6tiZswNdNT6qzX0=";

37+ rev = "8e669aa6990e0ed219c169d491472d749f54c393";

38+ sha256 = "sha256-l8ckbCqjz3GUfwStcl3H2C+un5dZfT2uLtayvdu93D4=";

3939 };

4040

4141 # Derived from vst3.wrap

4242 vst3 = fetchFromGitHub {

4343 owner = "robbert-vdh";

4444 repo = "vst3sdk";

45− rev = "v3.7.3_build_20-patched";

45+ rev = "v3.7.4_build_25-patched";

4646 fetchSubmodules = true;

47− sha256 = "sha256-m2y7No7BNbIjLNgdAqIAEr6UuAZZ/wwM2+iPWKK17gQ=";

47+ sha256 = "sha256-oHRJZItw+he5M+beVZkUrhJir6rgFZ80ORzA73mJT2A=";

4848 };

4949in multiStdenv.mkDerivation rec {

5050 pname = "yabridge";

51− version = "3.7.0";

51+ version = "3.8.0";

5252

5353 # NOTE: Also update yabridgectl's cargoHash when this is updated

5454 src = fetchFromGitHub {

5555 owner = "robbert-vdh";

5656 repo = pname;

5757 rev = version;

58− sha256 = "sha256-dz7kScNrVUsjokJntzUCJzDIboqi3vQI+RpXl0UFmUQ=";

58+ sha256 = "sha256-XacJjHxsp60/l36pFPGonUyOsyFF2lmqplAaisHXZDY=";

5959 };

6060

6161 # Unpack subproject sources

pkgs/tools/audio/yabridge/hardcode-dependencies.patch+4−4

@@ -1,8 +1,8 @@

11diff --git a/meson.build b/meson.build

2−index 8eae0442..ec0649da 100644

2+index 95ecb728..cb30f3af 100644

33--- a/meson.build

44+++ b/meson.build

5−@@ -196,6 +196,7 @@ if with_32bit_libraries or with_bitbridge

5+@@ -201,6 +201,7 @@ if with_32bit_libraries or with_bitbridge

66 'boost_filesystem',

77 static : with_static_boost,

88 dirs : [

@@ -10,7 +10,7 @@ index 8eae0442..ec0649da 100644

1010 # Used by Arch based distros

1111 '/usr/local/lib32',

1212 '/usr/lib32',

13−@@ -219,7 +220,7 @@ if is_64bit_system

13+@@ -224,7 +225,7 @@ if is_64bit_system

1414 xcb_64bit_dep = dependency('xcb')

1515 endif

1616 if with_32bit_libraries or with_bitbridge

@@ -20,7 +20,7 @@ index 8eae0442..ec0649da 100644

2020

2121 # These are all headers-only libraries, and thus won't require separate 32-bit

2222diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp

23−index 6e32b4c9..f6eb09eb 100644

23+index 1a457f03..20ca1e63 100644

2424--- a/src/plugin/utils.cpp

2525+++ b/src/plugin/utils.cpp

2626@@ -107,7 +107,7 @@ std::string PluginInfo::wine_version() const {

pkgs/tools/audio/yabridgectl/default.nix+1−1

@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {

1111

1212 src = yabridge.src;

1313 sourceRoot = "source/tools/yabridgectl";

14− cargoSha256 = "sha256-/VREh/f4bAt2DXCqK0noEjn+4hcK5VZUn+gdbYbeAmk=";

14+ cargoSha256 = "sha256-pwy2Q2HUCihr7W81hGvDm9EiZHk9G8knSy0yxPy6hl8=";

1515

1616 patches = [

1717 # By default, yabridgectl locates libyabridge.so by using

pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch+9−6

@@ -1,5 +1,5 @@

11diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs

2−index bc5ccfc4..c6d119bc 100644

2+index bc5f6a81..0fcd38d3 100644

33--- a/tools/yabridgectl/src/config.rs

44+++ b/tools/yabridgectl/src/config.rs

55@@ -23,6 +23,7 @@ use std::collections::{BTreeMap, BTreeSet, HashSet};

@@ -10,7 +10,7 @@ index bc5ccfc4..c6d119bc 100644

1010 use std::path::{Path, PathBuf};

1111 use which::which;

1212 use xdg::BaseDirectories;

13−@@ -233,34 +234,24 @@ impl Config {

13+@@ -235,34 +236,27 @@ impl Config {

1414 }

1515 }

1616 None => {

@@ -20,6 +20,8 @@ index bc5ccfc4..c6d119bc 100644

2020- // in the error message when `libyabridge-vst2.so` can't be found.

2121- let system_path = Path::new("/usr/lib");

2222+ // Search through NIX_PROFILES & data home directory if no path was set explicitly.

23++ // NIX_PROFILES is iterated in reverse from the most specific (the user profile) to

24++ // the least specific (the system profile).

2325+ let nix_profiles = env::var("NIX_PROFILES");

2426 let user_path = xdg_dirs.get_data_home();

2527- let lib_directories = [

@@ -35,6 +37,7 @@ index bc5ccfc4..c6d119bc 100644

3537- ];

3638+ let lib_directories = nix_profiles.iter()

3739+ .flat_map(|profiles| profiles.split(' ')

40++ .rev()

3841+ .map(|profile| Path::new(profile).join("lib")))

3942+ .chain(iter::once(user_path.clone()));

4043+

@@ -56,12 +59,12 @@ index bc5ccfc4..c6d119bc 100644

5659 ));

5760 }

5861diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs

59−index 8c273f92..432619ec 100644

62+index 48cce4fa..209e40e4 100644

6063--- a/tools/yabridgectl/src/main.rs

6164+++ b/tools/yabridgectl/src/main.rs

62−@@ -148,7 +148,7 @@ fn main() -> Result<()> {

63− .about("Path to the directory containing 'libyabridge-{vst2,vst3}.so'")

64− .long_about(

65+@@ -151,7 +151,7 @@ fn main() -> Result<()> {

66+ .help("Path to the directory containing 'libyabridge-{vst2,vst3}.so'")

67+ .long_help(

6568 "Path to the directory containing 'libyabridge-{vst2,vst3}.so'. If this \

6669- is not set, then yabridgectl will look in both '/usr/lib' and \

6770+ is not set, then yabridgectl will look through 'NIX_PROFILES' and \