diff --git a/pkgs/by-name/pe/persepolis/0003-Search-PATH-for-aria2c-on-darwin.patch b/pkgs/by-name/pe/persepolis/0003-Search-PATH-for-aria2c-on-darwin.patch deleted file mode 100644 index 505961d1ce6b..000000000000 --- a/pkgs/by-name/pe/persepolis/0003-Search-PATH-for-aria2c-on-darwin.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- - persepolis/scripts/download.py | 10 +--------- - 1 file changed, 1 insertion(+), 9 deletions(-) - -diff --git a/persepolis/scripts/download.py b/persepolis/scripts/download.py -index aaabb35..69676d3 100644 ---- a/persepolis/scripts/download.py -+++ b/persepolis/scripts/download.py -@@ -72,16 +72,8 @@ def startAria(): - - # in macintosh - elif os_type == OS.OSX: -- if aria2_path == "" or aria2_path == None or os.path.isfile(str(aria2_path)) == False: -- -- cwd = sys.argv[0] -- current_directory = os.path.dirname(cwd) -- aria2d = os.path.join(current_directory, 'aria2c') - -- else: -- aria2d = aria2_path -- -- subprocess.Popen([aria2d, '--no-conf', -+ subprocess.Popen(['aria2c', '--no-conf', - '--enable-rpc', '--rpc-listen-port=' + str(port), - '--rpc-max-request-size=2M', - '--rpc-listen-all', '--quiet=true'], --- -2.39.3 (Apple Git-145) - diff --git a/pkgs/by-name/pe/persepolis/0004-Search-PATH-for-ffmpeg-on-darwin.patch b/pkgs/by-name/pe/persepolis/0004-Search-PATH-for-ffmpeg-on-darwin.patch deleted file mode 100644 index 800f7bddd408..000000000000 --- a/pkgs/by-name/pe/persepolis/0004-Search-PATH-for-ffmpeg-on-darwin.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- - persepolis/scripts/mainwindow.py | 2 +- - persepolis/scripts/useful_tools.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/persepolis/scripts/mainwindow.py b/persepolis/scripts/mainwindow.py -index d21f3f4..a0e3674 100644 ---- a/persepolis/scripts/mainwindow.py -+++ b/persepolis/scripts/mainwindow.py -@@ -161,7 +161,7 @@ class CheckVersionsThread(QThread): - - else: - pipe = subprocess.Popen( -- [ffmpeg_path, '-version'], -+ ['ffmpeg', '-version'], - stdout=subprocess.PIPE, - stdin=subprocess.PIPE, - stderr=subprocess.PIPE, -diff --git a/persepolis/scripts/useful_tools.py b/persepolis/scripts/useful_tools.py -index b780967..31733eb 100644 ---- a/persepolis/scripts/useful_tools.py -+++ b/persepolis/scripts/useful_tools.py -@@ -342,7 +342,7 @@ def muxer(parent, video_finder_dictionary): - current_directory = os.path.dirname(cwd) - ffmpeg_path = os.path.join(current_directory, 'ffmpeg') - -- pipe = subprocess.Popen([ffmpeg_path, '-i', video_file_path, -+ pipe = subprocess.Popen(['ffmpeg', '-i', video_file_path, - '-i', audio_file_path, - '-c', 'copy', - '-shortest', --- -2.39.3 (Apple Git-145) - diff --git a/pkgs/by-name/pe/persepolis/package.nix b/pkgs/by-name/pe/persepolis/package.nix index 105af13a299e..b16e08a3f564 100644 --- a/pkgs/by-name/pe/persepolis/package.nix +++ b/pkgs/by-name/pe/persepolis/package.nix @@ -2,7 +2,6 @@ , qt5 , python3 , fetchFromGitHub -, aria2 , ffmpeg , libnotify , pulseaudio @@ -14,47 +13,34 @@ python3.pkgs.buildPythonApplication rec { pname = "persepolis"; - version = "4.0.1"; + version = "5.0.1"; format = "other"; src = fetchFromGitHub { owner = "persepolisdm"; repo = "persepolis"; - rev = "57dc9d438bb3f126070a17c7a3677c45ea4dd332"; - hash = "sha256-7OXAITFQJ2/aY0QmqlAo7if7cY7+T3j6PUjfJJV8Z2Q="; + rev = "refs/tags/${version}"; + hash = "sha256-ffEXPkpHGwvVzUxO6sjAEKYbxRod7o8f7DWR5AN+SkA="; }; - patches = [ - # Upstream does currently not allow building from source on macOS. These patches can likely - # be removed if https://github.com/persepolisdm/persepolis/issues/943 is fixed upstream - ./0003-Search-PATH-for-aria2c-on-darwin.patch - ./0004-Search-PATH-for-ffmpeg-on-darwin.patch - ]; - postPatch = '' # Ensure dependencies with hard-coded FHS dependencies are properly detected substituteInPlace check_dependencies.py --replace-fail "isdir(notifications_path)" "isdir('${sound-theme-freedesktop}/share/sounds/freedesktop')" ''; - postInstall = '' - mkdir -p $out/share/applications - cp $src/xdg/com.github.persepolisdm.persepolis.desktop $out/share/applications - ''; - # prevent double wrapping dontWrapQtApps = true; nativeBuildInputs = [ meson ninja pkg-config qt5.wrapQtAppsHook ]; # feed args to wrapPythonApp makeWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ aria2 ffmpeg libnotify ]}" + "--prefix PATH : ${lib.makeBinPath [ ffmpeg libnotify ]}" "\${qtWrapperArgs[@]}" ]; # The presence of these dependencies is checked during setuptoolsCheckPhase, # but apart from that, they're not required during build, only runtime nativeCheckInputs = [ - aria2 libnotify pulseaudio sound-theme-freedesktop @@ -74,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { ]); meta = with lib; { - description = "GUI for aria2"; + description = "Download manager GUI written in Python"; mainProgram = "persepolis"; homepage = "https://persepolisdm.github.io/"; license = licenses.gpl3Plus;