From 860472df032c79678cd3dcb1109f6ea33aa1e634 Mon Sep 17 00:00:00 2001
From: Patrizio Bekerle <patrizio@bekerle.com>
Date: Mon, 30 Dec 2024 19:40:11 +0100
Subject: [PATCH] qownnotes: move package to by-name directory

Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>
---
 .../qo/qownnotes/package.nix}                 | 24 +++++++------------
 pkgs/top-level/all-packages.nix               |  4 ----
 2 files changed, 9 insertions(+), 19 deletions(-)
 rename pkgs/{applications/office/qownnotes/default.nix => by-name/qo/qownnotes/package.nix} (89%)

diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/by-name/qo/qownnotes/package.nix
similarity index 89%
rename from pkgs/applications/office/qownnotes/default.nix
rename to pkgs/by-name/qo/qownnotes/package.nix
index 12da21cfd6fe..f3b8d8fc3e08 100644
--- a/pkgs/applications/office/qownnotes/default.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -1,15 +1,9 @@
 { lib
 , stdenv
 , fetchurl
+, qt6Packages
 , cmake
-, qttools
-, qtbase
-, qtdeclarative
-, qtsvg
-, qtwayland
-, qtwebsockets
 , makeWrapper
-, wrapQtAppsHook
 , botan2
 , pkg-config
 , nixosTests
@@ -22,7 +16,7 @@ let
   appname = "QOwnNotes";
   version = "24.12.7";
 in
-stdenv.mkDerivation {
+qt6Packages.stdenv.mkDerivation {
   inherit pname version;
 
   src = fetchurl {
@@ -32,19 +26,19 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     cmake
-    qttools
-    wrapQtAppsHook
+    qt6Packages.qttools
+    qt6Packages.wrapQtAppsHook
     pkg-config
     installShellFiles
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xvfb-run ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ];
 
   buildInputs = [
-    qtbase
-    qtdeclarative
-    qtsvg
-    qtwebsockets
+    qt6Packages.qtbase
+    qt6Packages.qtdeclarative
+    qt6Packages.qtsvg
+    qt6Packages.qtwebsockets
     botan2
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ];
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6Packages.qtwayland ];
 
   cmakeFlags = [
     "-DQON_QT6_BUILD=ON"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2036862232f..0ab8656290ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4951,10 +4951,6 @@ with pkgs;
 
   qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { };
 
-  qownnotes = qt6Packages.callPackage ../applications/office/qownnotes {
-    stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
-  };
-
   qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { };
 
   qtspim = libsForQt5.callPackage ../development/tools/misc/qtspim { };