Merge pull request #220546 from kira-bruneau/yabridge
yabridge, yabridgectl: 5.0.3 → 5.0.4
This commit is contained in:
commit
7229e70a11
|
@ -3,7 +3,6 @@
|
|||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
, pkgsi686Linux
|
||||
, fetchpatch
|
||||
, dbus
|
||||
, meson
|
||||
, ninja
|
||||
|
@ -18,7 +17,7 @@ let
|
|||
asio = fetchFromGitHub {
|
||||
owner = "chriskohlhoff";
|
||||
repo = "asio";
|
||||
rev = "asio-1-22-1";
|
||||
rev = "refs/tags/asio-1-22-1";
|
||||
sha256 = "sha256-UDLhx2yI6Txg0wP5H4oNIhgKIB2eMxUGCyT2x/7GgVg=";
|
||||
};
|
||||
|
||||
|
@ -26,7 +25,7 @@ let
|
|||
bitsery = fetchFromGitHub {
|
||||
owner = "fraillt";
|
||||
repo = "bitsery";
|
||||
rev = "v5.2.2";
|
||||
rev = "refs/tags/v5.2.2";
|
||||
sha256 = "sha256-VwzVtxt+E/SVcxqIJw8BKPO2q7bu/hkhY+nB7FHrZpY=";
|
||||
};
|
||||
|
||||
|
@ -34,15 +33,15 @@ let
|
|||
clap = fetchFromGitHub {
|
||||
owner = "free-audio";
|
||||
repo = "clap";
|
||||
rev = "1.1.4";
|
||||
sha256 = "sha256-3zDvzC3Hs4OmT2qvaDa69rmBkHoQ8qY9TZlsPxsJA40=";
|
||||
rev = "refs/tags/1.1.7";
|
||||
sha256 = "sha256-WcMTxE+QCzlp4lhFdghZI8UI/5mdVeRvrl24Xynd0qk=";
|
||||
};
|
||||
|
||||
# Derived from subprojects/function2.wrap
|
||||
function2 = fetchFromGitHub {
|
||||
owner = "Naios";
|
||||
repo = "function2";
|
||||
rev = "4.2.0";
|
||||
rev = "refs/tags/4.2.0";
|
||||
sha256 = "sha256-wrt+fCcM6YD4ZRZYvqqB+fNakCNmltdPZKlNkPLtgMs=";
|
||||
};
|
||||
|
||||
|
@ -50,7 +49,7 @@ let
|
|||
ghc_filesystem = fetchFromGitHub {
|
||||
owner = "gulrak";
|
||||
repo = "filesystem";
|
||||
rev = "v1.5.12";
|
||||
rev = "refs/tags/v1.5.12";
|
||||
sha256 = "sha256-j4RE5Ach7C7Kef4+H9AHSXa2L8OVyJljDwBduKcC4eE=";
|
||||
};
|
||||
|
||||
|
@ -58,28 +57,29 @@ let
|
|||
tomlplusplus = fetchFromGitHub {
|
||||
owner = "marzer";
|
||||
repo = "tomlplusplus";
|
||||
rev = "v3.0.1";
|
||||
sha256 = "sha256-l8ckbCqjz3GUfwStcl3H2C+un5dZfT2uLtayvdu93D4=";
|
||||
rev = "refs/tags/v3.3.0";
|
||||
sha256 = "sha256-INX8TOEumz4B5coSxhiV7opc3rYJuQXT2k1BJ3Aje1M=";
|
||||
};
|
||||
|
||||
# Derived from vst3.wrap
|
||||
vst3 = fetchFromGitHub {
|
||||
owner = "robbert-vdh";
|
||||
repo = "vst3sdk";
|
||||
rev = "v3.7.7_build_19-patched";
|
||||
rev = "refs/tags/v3.7.7_build_19-patched";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-LsPHPoAL21XOKmF1Wl/tvLJGzjaCLjaDAcUtDvXdXSU=";
|
||||
};
|
||||
in multiStdenv.mkDerivation rec {
|
||||
in
|
||||
multiStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "yabridge";
|
||||
version = "5.0.3";
|
||||
version = "5.0.4";
|
||||
|
||||
# NOTE: Also update yabridgectl's cargoHash when this is updated
|
||||
src = fetchFromGitHub {
|
||||
owner = "robbert-vdh";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-T3BU77BbVr6vlVoijUQy86eF0lCgM4S4d5VSnLE4pas=";
|
||||
repo = "yabridge";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
sha256 = "sha256-15WTCXMvghoU5TkE8yuQJrxj9cwVjczDKGKWjoUS6SI=";
|
||||
};
|
||||
|
||||
# Unpack subproject sources
|
||||
|
@ -104,14 +104,6 @@ in multiStdenv.mkDerivation rec {
|
|||
|
||||
# Patch the chainloader to search for libyabridge through NIX_PROFILES
|
||||
./libyabridge-from-nix-profiles.patch
|
||||
|
||||
# Remove with next yabridge update
|
||||
(fetchpatch {
|
||||
name = "fix-for-wine-8.0.patch";
|
||||
url = "https://github.com/robbert-vdh/yabridge/commit/29acd40a9add635e2cb40ecc54c88d65604a7a2a.patch";
|
||||
sha256 = "sha256-hVxa/FqH7d938Z/VjHdhmYLCLPZoa9C4xKSKRKiVPSU=";
|
||||
includes = [ "meson.build" ];
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
@ -166,9 +158,9 @@ in multiStdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "A modern and transparent way to use Windows VST2 and VST3 plugins on Linux";
|
||||
homepage = src.meta.homepage;
|
||||
homepage = "https://github.com/robbert-vdh/yabridge";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ kira-bruneau ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/meson.build b/meson.build
|
||||
index bfab6361..9085db0f 100644
|
||||
index f76f5acf..045e9d40 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -187,7 +187,7 @@ if is_64bit_system
|
||||
@@ -221,7 +221,7 @@ if is_64bit_system
|
||||
xcb_64bit_dep = dependency('xcb')
|
||||
endif
|
||||
if with_32bit_libraries or with_bitbridge
|
||||
|
@ -12,7 +12,7 @@ index bfab6361..9085db0f 100644
|
|||
|
||||
# These are all headers-only libraries, and thus won't require separate 32-bit
|
||||
diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp
|
||||
index acd431bc..8566281c 100644
|
||||
index 8d6236ad..ea5c1396 100644
|
||||
--- a/src/plugin/utils.cpp
|
||||
+++ b/src/plugin/utils.cpp
|
||||
@@ -93,7 +93,7 @@ std::string PluginInfo::wine_version() const {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
diff --git a/src/chainloader/utils.cpp b/src/chainloader/utils.cpp
|
||||
index ccd65d33..c7136b37 100644
|
||||
index c43e5693..b8352adf 100644
|
||||
--- a/src/chainloader/utils.cpp
|
||||
+++ b/src/chainloader/utils.cpp
|
||||
@@ -29,8 +29,10 @@
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs
|
||||
index 76075938..4f69642f 100644
|
||||
index 53200bd5..ef8a781d 100644
|
||||
--- a/tools/yabridgectl/src/config.rs
|
||||
+++ b/tools/yabridgectl/src/config.rs
|
||||
@@ -22,6 +22,7 @@ use serde_derive::{Deserialize, Serialize};
|
||||
|
@ -58,7 +58,7 @@ index 76075938..4f69642f 100644
|
|||
));
|
||||
}
|
||||
diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs
|
||||
index e5618575..72b730f1 100644
|
||||
index 8dcd7dc8..bddca534 100644
|
||||
--- a/tools/yabridgectl/src/main.rs
|
||||
+++ b/tools/yabridgectl/src/main.rs
|
||||
@@ -135,7 +135,7 @@ fn main() -> Result<()> {
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
, wine
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "yabridgectl";
|
||||
version = yabridge.version;
|
||||
|
||||
src = yabridge.src;
|
||||
sourceRoot = "source/tools/yabridgectl";
|
||||
cargoSha256 = "sha256-X7YcIjKLzuts7d9VD6hLFCiEBrY4opi8nInjPs9jAh0=";
|
||||
cargoSha256 = "sha256-qr6obmabcO3n+DxMxkj3mbpzR/Wn6eOg2J99/FarMVs=";
|
||||
|
||||
patches = [
|
||||
# Patch yabridgectl to search for the chainloader through NIX_PROFILES
|
||||
|
@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "A small, optional utility to help set up and update yabridge for several directories at once";
|
||||
homepage = "${src.meta.homepage}/tree/${version}/tools/yabridgectl";
|
||||
homepage = "${yabridge.src.meta.homepage}/tree/${yabridge.version}/tools/yabridgectl";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ kira-bruneau ];
|
||||
platforms = yabridge.meta.platforms;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
diff --git a/tools/yabridgectl/src/actions.rs b/tools/yabridgectl/src/actions.rs
|
||||
index 03617c4d..19ade93e 100644
|
||||
index 25857753..59590e38 100644
|
||||
--- a/tools/yabridgectl/src/actions.rs
|
||||
+++ b/tools/yabridgectl/src/actions.rs
|
||||
@@ -835,14 +835,6 @@ pub fn do_sync(config: &mut Config, options: &SyncOptions) -> Result<()> {
|
||||
|
|
Loading…
Reference in a new issue