qt6Packages.accounts-qml-module: init at 0.7-unstable-2023-10-28 (#514783)

pkgs/development/libraries/accounts-qml-module/default.nix

@@ -14,6 +14,9 @@
   xvfb-run,
 }:
 
+let
+  withQt6 = lib.versions.major qtbase.version == "6";
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "accounts-qml-module";
   version = "0.7-unstable-2023-10-28";
@@ -27,6 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [
     "out"
+  ]
+  ++ lib.optionals (!withQt6) [
     "doc"
   ];
 
@@ -54,6 +59,8 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     qmake
     qtdeclarative # qmlplugindump
+  ]
+  ++ lib.optionals (!withQt6) [
     qttools # qdoc
   ];
 
@@ -71,6 +78,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontWrapQtApps = true;
 
+  qmakeFlags = lib.optionals withQt6 [
+    # No qdoc in Qt6 qttools?
+    "CONFIG+=no_docs"
+  ];
+
   postConfigure = ''
     make qmake_all
   '';
@@ -87,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
     export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix}
   '';
 
-  postFixup = ''
+  postFixup = lib.optionalString (!withQt6) ''
     moveToOutput share/accounts-qml-module/doc $doc
   '';
 

pkgs/top-level/qt6-packages.nix

@@ -42,6 +42,7 @@ makeScopeWithSplicing' {
     // {
 
       # LIBRARIES
+      accounts-qml-module = callPackage ../development/libraries/accounts-qml-module { };
       accounts-qt = callPackage ../development/libraries/accounts-qt { };
       appstream-qt = callPackage ../development/libraries/appstream/qt.nix { };