lomiri-qt6.lomiri-download-manager: init at 0.3.0

pkgs/desktops/lomiri/default.nix

@@ -34,6 +34,12 @@ let
       };
       lomiri-ui-extras = callPackage ./qml/lomiri-ui-extras { };
       lomiri-ui-toolkit = callPackage ./qml/lomiri-ui-toolkit { };
+
+      #### Services
+      lomiri-download-manager = callPackage ./services/lomiri-download-manager {
+        # Check for working qdoc: not found
+        withDocumentation = !useQt6;
+      };
     }
     // lib.optionalAttrs (!useQt6) {
       #### Core Apps
@@ -76,7 +82,6 @@ let
       biometryd = callPackage ./services/biometryd { };
       lomiri-content-hub = callPackage ./services/lomiri-content-hub { };
       hfd-service = callPackage ./services/hfd-service { };
-      lomiri-download-manager = callPackage ./services/lomiri-download-manager { };
       lomiri-history-service = callPackage ./services/lomiri-history-service { };
       lomiri-indicator-datetime = ayatana-indicator-datetime.override { enableLomiriFeatures = true; };
       lomiri-indicator-network = callPackage ./services/lomiri-indicator-network { };

pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix

@@ -21,12 +21,16 @@
   python3,
   qtbase,
   qtdeclarative,
+  qtscxml,
   qttools,
   validatePkgConfig,
   wrapQtAppsHook,
   xvfb-run,
 }:
 
+let
+  withQt6 = lib.strings.versionAtLeast qtbase.version "6";
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-download-manager";
   version = "0.3.0";
@@ -72,6 +76,9 @@ stdenv.mkDerivation (finalAttrs: {
     validatePkgConfig
     wrapQtAppsHook
   ]
+  ++ lib.optionals withQt6 [
+    qtscxml
+  ]
   ++ lib.optionals withDocumentation [
     doxygen
     graphviz
@@ -98,9 +105,9 @@ stdenv.mkDerivation (finalAttrs: {
   checkInputs = [ gtest ];
 
   cmakeFlags = [
-    (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6"))
+    (lib.cmakeBool "ENABLE_QT6" withQt6)
     (lib.cmakeBool "ENABLE_DOC" withDocumentation)
-    (lib.cmakeBool "ENABLE_WERROR" true)
+    (lib.cmakeBool "ENABLE_WERROR" (!withQt6))
   ];
 
   makeTargets = [ "all" ] ++ lib.optionals withDocumentation [ "doc" ];
@@ -129,7 +136,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.lgpl3Only;
     teams = [ lib.teams.lomiri ];
     platforms = lib.platforms.linux;
-    pkgConfigModules = [
+    pkgConfigModules = map (pc: pc + lib.optionalString withQt6 "-qt6") [
       "ldm-common"
       "lomiri-download-manager-client"
       "lomiri-download-manager-common"