diff --git a/pkgs/tools/networking/persepolis/0001-Allow-building-on-darwin.patch b/pkgs/by-name/pe/persepolis/0001-Allow-building-on-darwin.patch similarity index 100% rename from pkgs/tools/networking/persepolis/0001-Allow-building-on-darwin.patch rename to pkgs/by-name/pe/persepolis/0001-Allow-building-on-darwin.patch diff --git a/pkgs/tools/networking/persepolis/0002-Fix-startup-crash-on-darwin.patch b/pkgs/by-name/pe/persepolis/0002-Fix-startup-crash-on-darwin.patch similarity index 100% rename from pkgs/tools/networking/persepolis/0002-Fix-startup-crash-on-darwin.patch rename to pkgs/by-name/pe/persepolis/0002-Fix-startup-crash-on-darwin.patch diff --git a/pkgs/tools/networking/persepolis/0003-Search-PATH-for-aria2c-on-darwin.patch b/pkgs/by-name/pe/persepolis/0003-Search-PATH-for-aria2c-on-darwin.patch similarity index 100% rename from pkgs/tools/networking/persepolis/0003-Search-PATH-for-aria2c-on-darwin.patch rename to pkgs/by-name/pe/persepolis/0003-Search-PATH-for-aria2c-on-darwin.patch diff --git a/pkgs/tools/networking/persepolis/0004-Search-PATH-for-ffmpeg-on-darwin.patch b/pkgs/by-name/pe/persepolis/0004-Search-PATH-for-ffmpeg-on-darwin.patch similarity index 100% rename from pkgs/tools/networking/persepolis/0004-Search-PATH-for-ffmpeg-on-darwin.patch rename to pkgs/by-name/pe/persepolis/0004-Search-PATH-for-ffmpeg-on-darwin.patch diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/by-name/pe/persepolis/package.nix similarity index 92% rename from pkgs/tools/networking/persepolis/default.nix rename to pkgs/by-name/pe/persepolis/package.nix index 79d936ee3b1a..0aa47b37fe17 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/by-name/pe/persepolis/package.nix @@ -1,22 +1,16 @@ { lib , stdenv -, buildPythonApplication +, qt5 +, python3 , fetchFromGitHub , aria2 , ffmpeg , libnotify , pulseaudio -, psutil -, pyqt5 -, requests -, setproctitle -, setuptools , sound-theme-freedesktop -, wrapQtAppsHook -, yt-dlp }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "persepolis"; version = "4.0.0"; @@ -56,7 +50,7 @@ buildPythonApplication rec { # prevent double wrapping dontWrapQtApps = true; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; # feed args to wrapPythonApp makeWrapperArgs = [ @@ -76,14 +70,15 @@ buildPythonApplication rec { propagatedBuildInputs = [ pulseaudio + sound-theme-freedesktop + ] ++ (with python3.pkgs; [ psutil pyqt5 requests setproctitle setuptools - sound-theme-freedesktop yt-dlp - ]; + ]); meta = with lib; { description = "A GUI for aria2"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d27dce0cd59a..fcf396fee365 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6139,10 +6139,6 @@ with pkgs; pcp = callPackage ../tools/misc/pcp { }; - persepolis = python3Packages.callPackage ../tools/networking/persepolis { - wrapQtAppsHook = qt5.wrapQtAppsHook; - }; - pev = callPackage ../development/tools/analysis/pev { }; phd2 = callPackage ../applications/science/astronomy/phd2 { };