From c79a19cea1bf20524269f2fd3bf232a907bd467b Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Mon, 23 Jun 2025 18:08:13 -0700
Subject: [PATCH] vorta: move to by-name

---
 .../default.nix => by-name/vo/vorta/package.nix}  | 15 +++++----------
 pkgs/top-level/all-packages.nix                   |  2 --
 2 files changed, 5 insertions(+), 12 deletions(-)
 rename pkgs/{applications/backup/vorta/default.nix => by-name/vo/vorta/package.nix} (92%)

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 e9917b580922..5ec5ee023e71 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2877,8 +2877,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;