diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-06-20 18:06:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-20 18:06:24 +0200 |
| commit | c8ed721ba208e411a594abcfd63b37f14a985b28 (patch) | |
| tree | db57d8d456d3413d0c2a82f1e16718604644cfca /pkgs/tools/audio | |
| parent | 81e98723500c35e04f3aa576dd54a418af049da8 (diff) | |
| parent | 7e052ffff2cb61d9c6df3d5e4b6f7137b095c28f (diff) | |
| download | nixpkgs-c8ed721ba208e411a594abcfd63b37f14a985b28.tar nixpkgs-c8ed721ba208e411a594abcfd63b37f14a985b28.tar.gz nixpkgs-c8ed721ba208e411a594abcfd63b37f14a985b28.tar.bz2 nixpkgs-c8ed721ba208e411a594abcfd63b37f14a985b28.tar.lz nixpkgs-c8ed721ba208e411a594abcfd63b37f14a985b28.tar.xz nixpkgs-c8ed721ba208e411a594abcfd63b37f14a985b28.tar.zst nixpkgs-c8ed721ba208e411a594abcfd63b37f14a985b28.zip | |
Merge pull request #127467 from kira-bruneau/yabridge
Diffstat (limited to 'pkgs/tools/audio')
| -rw-r--r-- | pkgs/tools/audio/yabridge/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/tools/audio/yabridgectl/default.nix | 3 |
2 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index 0013fac23a0..cbe35765cb4 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , substituteAll , meson , ninja @@ -58,14 +57,14 @@ let }; in stdenv.mkDerivation rec { pname = "yabridge"; - version = "3.2.0"; + version = "3.3.1"; # NOTE: Also update yabridgectl's cargoHash when this is updated src = fetchFromGitHub { owner = "robbert-vdh"; repo = pname; rev = version; - hash = "sha256-UT6st0Rc6HOaObE3N+qlPZZ8U1gl/MFLU0mjFuScdes="; + hash = "sha256-3B+6YuCWVJljqdyGpePjPf5JDwLSWFNgOCeLt8e4mO8="; }; # Unpack subproject sources @@ -80,13 +79,6 @@ in stdenv.mkDerivation rec { )''; patches = [ - # Fix for wine 6.8+ (remove patch in next release): - (fetchpatch { - url = "https://github.com/robbert-vdh/yabridge/commit/5577c4bfd842c60a8ae8ce2889bbfeb53a51c62b.patch"; - sha256 = "sha256-bTT08iWwDBVqi2PZPa7oal7/MqVu8t2Bh1gpjFMqLvQ="; - excludes = [ "CHANGELOG.md" ]; - }) - # Hard code wine path so wine version is correct in logs (substituteAll { src = ./hardcode-wine.patch; diff --git a/pkgs/tools/audio/yabridgectl/default.nix b/pkgs/tools/audio/yabridgectl/default.nix index 4f738310d85..bf0913372be 100644 --- a/pkgs/tools/audio/yabridgectl/default.nix +++ b/pkgs/tools/audio/yabridgectl/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = yabridge.src; sourceRoot = "source/tools/yabridgectl"; - cargoHash = "sha256-cB4Xp8pNLQRcPQ6HtVkDkLbfNSmM9yl+oRcEzcqrmkY="; + cargoHash = "sha256-f5k5OF+bEzH0b6M14Mdp8t4Qd5dP5Qj2fDsdiG1MkYk="; patches = [ # By default, yabridgectl locates libyabridge.so by using @@ -34,5 +34,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/robbert-vdh/yabridge/tree/master/tools/yabridgectl"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau ]; + platforms = yabridge.meta.platforms; }; } |