deepin.dtkcore: 5.6.29 -> 5.6.32

pkgs/desktops/deepin/library/dtkcore/default.nix

@@ -3,28 +3,24 @@
 , fetchFromGitHub
 , cmake
 , pkg-config
-, qttools
 , doxygen
-, wrapQtAppsHook
-, qtbase
+, libsForQt5
 , gsettings-qt
 , lshw
 , libuchardet
-, spdlog
 , dtkcommon
-, systemd
-, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
+, dtklog
 }:
 
 stdenv.mkDerivation rec {
   pname = "dtkcore";
-  version = "5.6.29";
+  version = "5.6.32";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-toqbEobi2R5tGnCYaShLyFdp4toEybMrWU+IORI/vu4=";
+    hash = "sha256-APuBVgewr701wzfTRwaQIg/ERFIhabEs5Jd6+GvD04k=";
   };
 
   patches = [
@@ -40,40 +36,37 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
     doxygen
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   dontWrapQtApps = true;
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     gsettings-qt
     lshw
     libuchardet
-    spdlog
-  ]
-  ++ lib.optional withSystemd systemd;
+  ];
 
-  propagatedBuildInputs = [ dtkcommon ];
+  propagatedBuildInputs = [ dtkcommon dtklog ];
 
   cmakeFlags = [
     "-DDTK_VERSION=${version}"
     "-DBUILD_DOCS=ON"
     "-DBUILD_EXAMPLES=OFF"
-    "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${qtbase.qtDocPrefix}"
+    "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${libsForQt5.qtbase.qtDocPrefix}"
     "-DDSG_PREFIX_PATH='/run/current-system/sw'"
     "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules"
     "-DTOOL_INSTALL_DIR=${placeholder "out"}/libexec/dtk5/DCore/bin"
     "-DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata"
-    "-DBUILD_WITH_SYSTEMD=${if withSystemd then "ON" else "OFF"}"
   ];
 
   preConfigure = ''
     # qt.qpa.plugin: Could not find the Qt platform plugin "minimal"
     # A workaround is to set QT_PLUGIN_PATH explicitly
-    export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix}
+    export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
   '';
 
   outputs = [ "out" "dev" "doc" ];