From 3a109c3ad3c3e37289f201117cf6efea9ef92187 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Tue, 15 Oct 2024 19:30:35 +0800
Subject: [PATCH] deepin.dde-device-formatter: clear up dtk qpa

---
 .../tools/dde-device-formatter/default.nix    | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix
index 08093b0befd7..2b13bd66ab0c 100644
--- a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix
+++ b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix
@@ -2,16 +2,13 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  dtkwidget,
-  deepin-gettext-tools,
-  qt5integration,
-  qmake,
-  qtbase,
-  qttools,
-  qtx11extras,
   pkg-config,
-  wrapQtAppsHook,
+  deepin-gettext-tools,
+  libsForQt5,
+  dtkwidget,
   udisks2-qt5,
+  qt5platform-plugins,
+  qt5integration,
 }:
 
 stdenv.mkDerivation rec {
@@ -34,30 +31,29 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    qmake
-    qttools
+    libsForQt5.qmake
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
     pkg-config
-    wrapQtAppsHook
     deepin-gettext-tools
   ];
 
   buildInputs = [
     dtkwidget
     udisks2-qt5
-    qtx11extras
+    qt5platform-plugins
+    qt5integration
+    libsForQt5.qtx11extras
   ];
 
   cmakeFlags = [ "-DVERSION=${version}" ];
 
-  # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
-  qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
-
-  meta = with lib; {
+  meta = {
     description = "Simple graphical interface for creating file system in a block device";
     mainProgram = "dde-device-formatter";
     homepage = "https://github.com/linuxdeepin/dde-device-formatter";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = teams.deepin.members;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.deepin.members;
   };
 }