diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/by-name/vo/vorta/package.nix similarity index 92% rename from pkgs/applications/backup/vorta/default.nix rename to pkgs/by-name/vo/vorta/package.nix index bb2d649bd099..05e277e07e34 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/by-name/vo/vorta/package.nix @@ -3,13 +3,10 @@ stdenv, python3Packages, fetchFromGitHub, - wrapQtAppsHook, - qtwayland, + qt6Packages, borgbackup, versionCheckHook, makeFontsConf, - qtbase, - qtsvg, }: python3Packages.buildPythonApplication rec { @@ -25,15 +22,13 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapQtAppsHook + qt6Packages.wrapQtAppsHook ]; buildInputs = - [ - qtsvg - ] + [ qt6Packages.qtsvg ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - qtwayland + qt6Packages.qtwayland ]; build-system = with python3Packages; [ @@ -85,7 +80,7 @@ python3Packages.buildPythonApplication rec { export FONTCONFIG_FILE=${fontsConf}; # For tests/test_misc.py::test_autostart mkdir -p $HOME/.config/autostart - export QT_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}" + export QT_PLUGIN_PATH="${qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix}" export QT_QPA_PLATFORM=offscreen ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c3f49361d7b..845e7e2c543c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2869,8 +2869,6 @@ with pkgs; uutils-coreutils-noprefix = uutils-coreutils.override { prefix = null; }; - vorta = qt6Packages.callPackage ../applications/backup/vorta { }; - xkcdpass = with python3Packages; toPythonApplication xkcdpass; zonemaster-cli = perlPackages.ZonemasterCLI;