From 21a5b0f53c73bae7bb7cfe5afbb584d9b25db550 Mon Sep 17 00:00:00 2001 From: huantian Date: Thu, 15 Aug 2024 13:11:29 -0700 Subject: [PATCH 1/2] tauon: 7.8.0 -> 7.8.2 --- pkgs/applications/audio/tauon/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index b134aa4b43d1..bc7bf1d195d8 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -19,6 +19,7 @@ mpg123, opusfile, pango, + pipewire, wavpack, ffmpeg, pulseaudio, @@ -27,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tauon"; - version = "7.8.0"; + version = "7.8.2"; src = fetchFromGitHub { owner = "Taiko2k"; - repo = "TauonMusicBox"; + repo = "Tauon"; rev = "v${finalAttrs.version}"; - hash = "sha256-8UnUcEvG206tPwyD+WqxcJgDvQlYvTJ6v+sm0u30Z3k="; + hash = "sha256-fVp3RWRNIBSeALbYNRIYjyWNH9An+YnS7neQt0x33yI="; }; postUnpack = '' @@ -54,15 +55,16 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'libopenmpt.so' '${lib.getLib libopenmpt}/lib/libopenmpt.so' substituteInPlace t_modules/t_phazor.py \ - --replace-fail 'lib/libphazor.so' '../../lib/libphazor.so' + --replace-fail 'lib/libphazor' '../../lib/libphazor' - substituteInPlace compile-phazor.sh --replace-fail 'gcc' '${stdenv.cc.targetPrefix}cc' + substituteInPlace compile-phazor*.sh --replace-fail 'gcc' '${stdenv.cc.targetPrefix}cc' substituteInPlace extra/tauonmb.desktop --replace-fail 'Exec=/opt/tauon-music-box/tauonmb.sh' 'Exec=${placeholder "out"}/bin/tauon' ''; postBuild = '' bash ./compile-phazor.sh + bash ./compile-phazor-pipewire.sh ''; nativeBuildInputs = [ @@ -84,6 +86,7 @@ stdenv.mkDerivation (finalAttrs: { mpg123 opusfile pango + pipewire wavpack ]; @@ -92,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { [ beautifulsoup4 dbus-python - isounidecode + unidecode jxlpy musicbrainzngs mutagen From 4c4ca343415a60bd18d50a0bdbdc4b8780ae67d4 Mon Sep 17 00:00:00 2001 From: huantian Date: Tue, 27 Aug 2024 14:19:10 -0700 Subject: [PATCH 2/2] tauon: turn discord rpc on by default upstream includes this on by default, and it's more convenient for users if they don't have to turn this on both in application settings, and in the derivation arguments. discord rpc doesn't take up a lot of space or time to build either, as it's just an additional pythong module. --- pkgs/applications/audio/tauon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index bc7bf1d195d8..b7e954abc4df 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -23,7 +23,7 @@ wavpack, ffmpeg, pulseaudio, - withDiscordRPC ? false, + withDiscordRPC ? true, }: stdenv.mkDerivation (finalAttrs: {