From 6f3c3f0f2511011c055af7a5a8caa76176c80ccd Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 4 Jul 2024 14:49:50 +0200
Subject: [PATCH] vnote: move to pkgs/by-name

---
 .../vn/vnote/package.nix}                     | 22 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 8 insertions(+), 16 deletions(-)
 rename pkgs/{applications/office/vnote/default.nix => by-name/vn/vnote/package.nix} (80%)

diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/by-name/vn/vnote/package.nix
similarity index 80%
rename from pkgs/applications/office/vnote/default.nix
rename to pkgs/by-name/vn/vnote/package.nix
index 30d4c3665075..a787f4a09e4b 100644
--- a/pkgs/applications/office/vnote/default.nix
+++ b/pkgs/by-name/vn/vnote/package.nix
@@ -2,13 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , cmake
-, qtbase
-, qtwebengine
-, qtsvg
-, qttools
-, qt5compat
-, qtwayland
-, wrapQtAppsHook
+, qt6
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,16 +19,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtwebengine
-    qtsvg
-    qttools
-    qt5compat
-    qtwayland
+    qt6.qtbase
+    qt6.qtwebengine
+    qt6.qtsvg
+    qt6.qttools
+    qt6.qt5compat
+    qt6.qtwayland
   ];
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77739c76077c..07cdf9b7702c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -39861,8 +39861,6 @@ with pkgs;
     buildGoModule = buildGo122Module;
   };
 
-  vnote = qt6Packages.callPackage ../applications/office/vnote { };
-
   sshportal = callPackage ../servers/sshportal { };
 
   ssh-audit = callPackage ../tools/security/ssh-audit { };