deepin: don't inherit libsForQt5 scope (#354028)

Author: wineee

pkgs/desktops/deepin/apps/deepin-album/default.nix

@@ -4,18 +4,15 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   dtkwidget,
   dtkdeclarative,
   qt5integration,
   qt5platform-plugins,
-  qtbase,
-  qtsvg,
   udisks2-qt5,
   gio-qt,
   freeimage,
-  ffmpeg,
+  ffmpeg_6,
   ffmpegthumbnailer,
 }:
 
@@ -33,21 +30,21 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     dtkwidget
     dtkdeclarative
     qt5integration
     qt5platform-plugins
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     udisks2-qt5
     gio-qt
     freeimage
-    ffmpeg
+    ffmpeg_6
     ffmpegthumbnailer
   ];
 

pkgs/desktops/deepin/apps/deepin-calculator/default.nix

@@ -5,13 +5,10 @@
   dtkwidget,
   qt5integration,
   qt5platform-plugins,
-  qtbase,
-  qtsvg,
+  libsForQt5,
   dde-qt-dbus-factory,
   cmake,
-  qttools,
   pkg-config,
-  wrapQtAppsHook,
   gtest,
 }:
 
@@ -28,17 +25,17 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qttools
+    libsForQt5.qttools
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     dtkwidget
     qt5integration
     qt5platform-plugins
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     dde-qt-dbus-factory
     gtest
   ];

pkgs/desktops/deepin/apps/deepin-camera/default.nix

@@ -4,17 +4,14 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   dtkwidget,
   wayland,
   dwayland,
   qt5integration,
   qt5platform-plugins,
   image-editor,
-  qtbase,
-  qtmultimedia,
-  ffmpeg,
+  ffmpeg_6,
   ffmpegthumbnailer,
   libusb1,
   libpciaccess,
@@ -43,15 +40,15 @@ stdenv.mkDerivation rec {
       --replace "/usr/share/libimagevisualresult" "${image-editor}/share/libimagevisualresult" \
       --replace "/usr/include/libusb-1.0" "${lib.getDev libusb1}/include/libusb-1.0"
     substituteInPlace src/com.deepin.Camera.service \
-      --replace "/usr/bin/qdbus" "${lib.getBin qttools}/bin/qdbus" \
+      --replace "/usr/bin/qdbus" "${lib.getBin libsForQt5.qttools}/bin/qdbus" \
       --replace "/usr/share" "$out/share"
   '';
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs =
@@ -62,9 +59,9 @@ stdenv.mkDerivation rec {
       qt5integration
       qt5platform-plugins
       image-editor
-      qtbase
-      qtmultimedia
-      ffmpeg
+      libsForQt5.qtbase
+      libsForQt5.qtmultimedia
+      ffmpeg_6
       ffmpegthumbnailer
       libusb1
       libpciaccess
@@ -88,7 +85,7 @@ stdenv.mkDerivation rec {
   qtWrapperArgs = [
     "--prefix LD_LIBRARY_PATH : ${
       lib.makeLibraryPath [
-        ffmpeg
+        ffmpeg_6
         ffmpegthumbnailer
         gst_all_1.gstreamer
         gst_all_1.gst-plugins-base

pkgs/desktops/deepin/apps/deepin-compressor/default.nix

@@ -7,12 +7,8 @@
   qt5platform-plugins,
   udisks2-qt5,
   cmake,
-  qtbase,
-  qttools,
   pkg-config,
-  kcodecs,
-  karchive,
-  wrapQtAppsHook,
+  libsForQt5,
   minizip,
   libzip,
   libuuid,
@@ -39,18 +35,18 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qttools
+    libsForQt5.qttools
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     dtkwidget
     qt5integration
     qt5platform-plugins
     udisks2-qt5
-    kcodecs
-    karchive
+    libsForQt5.kcodecs
+    libsForQt5.karchive
     minizip
     libzip
     libuuid
@@ -62,9 +58,6 @@ stdenv.mkDerivation rec {
     "-DUSE_TEST=OFF"
   ];
 
-  # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
-  qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
-
   strictDeps = true;
 
   meta = with lib; {

pkgs/desktops/deepin/apps/deepin-draw/default.nix

@@ -3,11 +3,8 @@
   lib,
   fetchFromGitHub,
   cmake,
-  qttools,
   pkg-config,
-  wrapQtAppsHook,
-  qtbase,
-  qtsvg,
+  libsForQt5,
   dtkwidget,
   qt5integration,
   qt5platform-plugins,
@@ -31,15 +28,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qttools
+    libsForQt5.qttools
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     qt5integration
-    qtsvg
+    libsForQt5.qtsvg
     dtkwidget
     qt5platform-plugins
   ];

pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix

@@ -5,8 +5,7 @@
   fetchpatch,
   cmake,
   pkg-config,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   qt5platform-plugins,
   dtkwidget,
   dtkdeclarative,
@@ -37,8 +36,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [

pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix

@@ -4,15 +4,10 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
-  qttools,
-  qtx11extras,
-  qtmultimedia,
+  libsForQt5,
   dtkwidget,
   qt5integration,
   qt5platform-plugins,
-  qtmpris,
-  qtdbusextended,
   gsettings-qt,
   elfutils,
   ffmpeg_6,
@@ -52,19 +47,19 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs =
     [
       dtkwidget
       qt5integration
       qt5platform-plugins
-      qtx11extras
-      qtmultimedia
-      qtdbusextended
-      qtmpris
+      libsForQt5.qtx11extras
+      libsForQt5.qtmultimedia
+      libsForQt5.qtdbusextended
+      libsForQt5.qtmpris
       gsettings-qt
       elfutils
       ffmpeg_6
@@ -88,8 +83,8 @@ stdenv.mkDerivation rec {
     ]);
 
   propagatedBuildInputs = [
-    qtmultimedia
-    qtx11extras
+    libsForQt5.qtmultimedia
+    libsForQt5.qtx11extras
     ffmpegthumbnailer
   ];
 

pkgs/desktops/deepin/apps/deepin-picker/default.nix

@@ -2,13 +2,9 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  qmake,
-  qttools,
   pkg-config,
-  wrapQtAppsHook,
+  libsForQt5,
   dtkwidget,
-  qtbase,
-  qtsvg,
   xorg,
 }:
 
@@ -24,16 +20,16 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    qttools
+    libsForQt5.qmake
+    libsForQt5.qttools
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     dtkwidget
-    qtsvg
+    libsForQt5.qtsvg
     xorg.libXtst
   ];
 

pkgs/desktops/deepin/apps/deepin-reader/default.nix

@@ -2,16 +2,12 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  qmake,
   pkg-config,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   dtkwidget,
   qt5integration,
   qt5platform-plugins,
   dde-qt-dbus-factory,
-  qtwebengine,
-  karchive,
   poppler,
   libchardet,
   libspectre,
@@ -42,19 +38,19 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     dtkwidget
     qt5integration
     qt5platform-plugins
     dde-qt-dbus-factory
-    qtwebengine
-    karchive
+    libsForQt5.qtwebengine
+    libsForQt5.karchive
     poppler
     libchardet
     libspectre