MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 00:08:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #127467 from kira-bruneau/yabridge

Browse source
This commit is contained in:
Sandro 2021-06-20 18:06:24 +02:00 committed by GitHub
commit c8ed721ba2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/tools/audio/yabridge/default.nix
View file

@ -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;

3
pkgs/tools/audio/yabridgectl/default.nix
View file

@ -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;
};
}