From dae0393b4b22e1c05e7a0c39c8f8fed36f44908b Mon Sep 17 00:00:00 2001 From: Irene Knapp Date: Fri, 7 Apr 2023 22:06:00 -0700 Subject: [PATCH] tenacity: unstable-2022-06-30 -> 1.3-beta2 --- pkgs/applications/audio/tenacity/default.nix | 34 ++++++++------------ 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/applications/audio/tenacity/default.nix index ae4454a6dc0..8e6ab17fbda 100644 --- a/pkgs/applications/audio/tenacity/default.nix +++ b/pkgs/applications/audio/tenacity/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchFromGitHub +, fetchFromGitea , fetchpatch , cmake , wxGTK32 @@ -30,7 +30,7 @@ , expat , libid3tag , libopus -, ffmpeg_4 +, ffmpeg_5 , soundtouch , pcre , portaudio @@ -49,32 +49,27 @@ stdenv.mkDerivation rec { pname = "tenacity"; - version = "unstable-2022-06-30"; + version = "1.3-beta2"; - src = fetchFromGitHub { + src = fetchFromGitea { + domain = "codeberg.org"; owner = "tenacityteam"; repo = pname; - rev = "91f8b4340b159af551fff94a284c6b0f704a7932"; - sha256 = "sha256-4VWckXzqo2xspw9eUloDvjxQYbsHn6ghEDw+hYqJcCE="; + rev = "v${version}"; + sha256 = "sha256-9gWoqFa87neIvRnezWI3RyCAOU4wKEHPn/Hgj3/fol0="; }; - patches = [ - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/wxwidgets-gtk3-3.1.6-plus.patch?h=tenacity-wxgtk3-git&id=c2503538fa7d7001181905988179952d09f69659"; - postFetch = "echo >> $out"; - sha256 = "sha256-xRY1tizBJ9CBY6e9oZVz4CWx7DWPGD9A9Ysol4prBww="; - }) - ]; - postPatch = '' - touch src/RevisionIdent.h + mkdir -p build/src/private + touch build/src/private/RevisionIdent.h - substituteInPlace src/FileNames.cpp \ - --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h + substituteInPlace libraries/lib-files/FileNames.cpp \ + --replace /usr/include/linux/magic.h \ + ${linuxHeaders}/include/linux/magic.h ''; postFixup = '' - rm $out/tenacity + rm $out/audacity wrapProgram "$out/bin/tenacity" \ --suffix AUDACITY_PATH : "$out/share/tenacity" \ --suffix AUDACITY_MODULES_PATH : "$out/lib/tenacity/modules" \ @@ -90,7 +85,6 @@ stdenv.mkDerivation rec { "-lavdevice" "-lavfilter" "-lavformat" - "-lavresample" "-lavutil" "-lpostproc" "-lswresample" @@ -110,7 +104,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib expat - ffmpeg_4 + ffmpeg_5 file flac glib