Merge pull request #108835 from MetaDark/yabridge

This commit is contained in:
Sandro 2021-02-17 04:12:56 +01:00 committed by GitHub
commit c340f37acb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 226 additions and 0 deletions

View file

@ -0,0 +1,127 @@
{ lib
, stdenv
, fetchFromGitHub
, meson
, ninja
, pkg-config
, wine
, boost
, libxcb
}:
let
# Derived from subprojects/bitsery.wrap
bitsery = rec {
version = "5.2.0";
src = fetchFromGitHub {
owner = "fraillt";
repo = "bitsery";
rev = "v${version}";
sha256 = "132b0n0xlpcv97l6bhk9n57hg95pkhwqzvr9jkv57nmggn76s5q7";
};
};
# Derived from subprojects/function2.wrap
function2 = rec {
version = "4.1.0";
src = fetchFromGitHub {
owner = "Naios";
repo = "function2";
rev = version;
sha256 = "0abrz2as62725g212qswi35nsdlf5wrhcz78hm2qidbgqr9rkir5";
};
};
# Derived from subprojects/tomlplusplus.wrap
tomlplusplus = rec {
version = "2.1.0";
src = fetchFromGitHub {
owner = "marzer";
repo = "tomlplusplus";
rev = "v${version}";
sha256 = "0fspinnpyk1c9ay0h3wl8d4bbm6aswlypnrw2c7pk2i4mh981b4b";
};
};
# Derived from vst3.wrap
vst3 = rec {
version = "e2fbb41f28a4b311f2fc7d28e9b4330eec1802b6";
src = fetchFromGitHub {
owner = "robbert-vdh";
repo = "vst3sdk";
rev = version;
fetchSubmodules = true;
sha256 = "1fqpylkbljifwdw2z75agc0yxnhmv4b09fxs3rvlw1qmm5mwx0p2";
};
};
in stdenv.mkDerivation rec {
pname = "yabridge";
version = "3.0.0";
# NOTE: Also update yabridgectl's cargoSha256 when this is updated
src = fetchFromGitHub {
owner = "robbert-vdh";
repo = pname;
rev = version;
sha256 = "0ha7jhnkd2i49q5rz2hp7sq6hv19bir99x51hs6nvvcf16hlf2bp";
};
# Unpack subproject sources
postUnpack = ''(
cd "$sourceRoot/subprojects"
cp -R --no-preserve=mode,ownership ${bitsery.src} bitsery-${bitsery.version}
tar -xf bitsery-patch-${bitsery.version}.tar.xz
cp -R --no-preserve=mode,ownership ${function2.src} function2-${function2.version}
tar -xf function2-patch-${function2.version}.tar.xz
cp -R --no-preserve=mode,ownership ${tomlplusplus.src} tomlplusplus
cp -R --no-preserve=mode,ownership ${vst3.src} vst3
)'';
postPatch = ''
patchShebangs .
'';
nativeBuildInputs = [
meson
ninja
pkg-config
wine
];
buildInputs = [
boost
libxcb
];
# Meson is no longer able to pick up Boost automatically.
# https://github.com/NixOS/nixpkgs/issues/86131
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
mesonFlags = [
"--cross-file" "cross-wine.conf"
# Requires CMake and is unnecessary
"-Dtomlplusplus:GENERATE_CMAKE_CONFIG=disabled"
# tomlplusplus examples and tests don't build with winegcc
"-Dtomlplusplus:BUILD_EXAMPLES=disabled"
"-Dtomlplusplus:BUILD_TESTS=disabled"
];
installPhase = ''
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"
'';
meta = with lib; {
description = "Yet Another VST bridge, run Windows VST2 plugins under Linux";
homepage = "https://github.com/robbert-vdh/yabridge";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ metadark ];
platforms = [ "x86_64-linux" ];
};
}

View file

@ -0,0 +1,23 @@
{ lib, rustPlatform, yabridge }:
rustPlatform.buildRustPackage rec {
pname = "yabridgectl";
version = yabridge.version;
src = yabridge.src;
sourceRoot = "source/tools/yabridgectl";
cargoSha256 = "1sjhani8h7ap42yqlnj05sx59jyz2h12qlm1ibv8ldxcpwps0bwy";
patches = [
./libyabridge-from-nix-profiles.patch
];
patchFlags = [ "-p3" ];
meta = with lib; {
description = "A small, optional utility to help set up and update yabridge for several directories at once";
homepage = "https://github.com/robbert-vdh/yabridge/tree/master/tools/yabridgectl";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ metadark ];
};
}

View file

@ -0,0 +1,70 @@
diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs
index c1c89cf..d7bd822 100644
--- a/tools/yabridgectl/src/config.rs
+++ b/tools/yabridgectl/src/config.rs
@@ -23,6 +23,7 @@ use std::collections::{BTreeMap, BTreeSet};
use std::env;
use std::fmt::Display;
use std::fs;
+use std::iter;
use std::path::{Path, PathBuf};
use which::which;
use xdg::BaseDirectories;
@@ -216,34 +217,24 @@ impl Config {
}
}
None => {
- // Search in the system library locations and in `~/.local/share/yabridge` if no
- // path was set explicitely. We'll also search through `/usr/local/lib` just in case
- // but since we advocate against installing yabridge there we won't list this path
- // in the error message when `libyabridge-vst2.so` can't be found.
- let system_path = Path::new("/usr/lib");
+ // Search through NIX_PROFILES & data home directory if no path was set explicitly.
+ let nix_profiles = env::var("NIX_PROFILES");
let user_path = xdg_dirs.get_data_home();
- let lib_directories = [
- system_path,
- // Used on Debian based distros
- Path::new("/usr/lib/x86_64-linux-gnu"),
- // Used on Fedora
- Path::new("/usr/lib64"),
- Path::new("/usr/local/lib"),
- Path::new("/usr/local/lib/x86_64-linux-gnu"),
- Path::new("/usr/local/lib64"),
- &user_path,
- ];
+ let lib_directories = nix_profiles.iter()
+ .flat_map(|profiles| profiles.split(' ')
+ .map(|profile| Path::new(profile).join("lib")))
+ .chain(iter::once(user_path.clone()));
+
let mut candidates = lib_directories
- .iter()
.map(|directory| directory.join(LIBYABRIDGE_VST2_NAME));
+
match candidates.find(|directory| directory.exists()) {
Some(candidate) => candidate,
_ => {
return Err(anyhow!(
- "Could not find '{}' in either '{}' or '{}'. You can override the \
- default search path using 'yabridgectl set --path=<path>'.",
+ "Could not find '{}' through 'NIX_PROFILES' or '{}'. You can override the \
+ default search path using 'yabridgectl set --path=<path>'.",
LIBYABRIDGE_VST2_NAME,
- system_path.display(),
user_path.display()
));
}
diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs
index 0db1bd4..221cdd0 100644
--- a/tools/yabridgectl/src/main.rs
+++ b/tools/yabridgectl/src/main.rs
@@ -102,7 +102,7 @@ fn main() -> Result<()> {
.about("Path to the directory containing 'libyabridge-{vst2,vst3}.so'")
.long_about(
"Path to the directory containing 'libyabridge-{vst2,vst3}.so'. If this \
- is not set, then yabridgectl will look in both '/usr/lib' and \
+ is not set, then yabridgectl will look through 'NIX_PROFILES' and \
'~/.local/share/yabridge' by default.",
)
.validator(validate_path)

View file

@ -748,6 +748,12 @@ in
metapixel = callPackage ../tools/graphics/metapixel { };
yabridge = callPackage ../tools/audio/yabridge {
wine = wineWowPackages.minimal;
};
yabridgectl = callPackage ../tools/audio/yabridgectl { };
### APPLICATIONS/TERMINAL-EMULATORS
alacritty = callPackage ../applications/terminal-emulators/alacritty {