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 { };