nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 03:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #170006 from kira-bruneau/yabridge

Browse Source 
yabridge, yabridgectl: 3.8.0 → 3.8.1
This commit is contained in:
Kira Bruneau 2022-04-23 22:36:28 -04:00 committed by GitHub
commit e1844e4c5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/audio/yabridge/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, multiStdenv
, fetchFromGitHub
, fetchpatch
, substituteAll
, pkgsi686Linux
, libnotify
@ -49,14 +48,14 @@ let
};
in multiStdenv.mkDerivation rec {
pname = "yabridge";
version = "3.8.0";
version = "3.8.1";
# NOTE: Also update yabridgectl's cargoHash when this is updated
src = fetchFromGitHub {
owner = "robbert-vdh";
repo = pname;
rev = version;
sha256 = "sha256-XacJjHxsp60/l36pFPGonUyOsyFF2lmqplAaisHXZDY=";
sha256 = "sha256-5Mi/aIjOKbn7guTj+AKGQRv+k7w4gzfdA9Mw4ocUlOE=";
};
# Unpack subproject sources
@ -78,14 +77,6 @@ in multiStdenv.mkDerivation rec {
libxcb32 = pkgsi686Linux.xorg.libxcb;
inherit libnotify wine;
})
# Remove with next yabridge update
(fetchpatch {
name = "fix-for-wine-7.1.patch";
url = "https://github.com/robbert-vdh/yabridge/commit/de470d345ab206b08f6d4a147b6af1d285a4211f.patch";
sha256 = "sha256-xJx1zvxD+DIjbkm7Ovoy4RaAvjx936/j/7AYUPh/kOo=";
includes = [ "src/wine-host/xdnd-proxy.cpp" ];
})
];
postPatch = ''

4
pkgs/tools/audio/yabridge/hardcode-dependencies.patch
View File

@ -1,5 +1,5 @@
diff --git a/meson.build b/meson.build
index 95ecb728..cb30f3af 100644
index c71d4fdb..b3f381ba 100644
--- a/meson.build
+++ b/meson.build
@@ -201,6 +201,7 @@ if with_32bit_libraries or with_bitbridge
@ -20,7 +20,7 @@ index 95ecb728..cb30f3af 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 1a457f03..20ca1e63 100644
index fc2c8b25..c73249e3 100644
--- a/src/plugin/utils.cpp
+++ b/src/plugin/utils.cpp
@@ -107,7 +107,7 @@ std::string PluginInfo::wine_version() const {

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

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
src = yabridge.src;
sourceRoot = "source/tools/yabridgectl";
cargoSha256 = "sha256-pwy2Q2HUCihr7W81hGvDm9EiZHk9G8knSy0yxPy6hl8=";
cargoSha256 = "sha256-ducF55d5OvCwlNFtt2r6pG5e9VevM2AzHSvPnWvIp1Y=";
patches = [
# By default, yabridgectl locates libyabridge.so by using