deepin.{qt6mpris: init at 1.0, deepin-music: 7.0.3 -> 7.0.9} (#344657)

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

@@ -4,18 +4,14 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  qttools,
-  wrapQtAppsHook,
-  dtkwidget,
-  dtkdeclarative,
-  qt5integration,
-  qt5platform-plugins,
-  udisks2-qt5,
-  qtmpris,
-  qtmultimedia,
-  kcodecs,
+  dtk6widget,
+  dtk6declarative,
+  qt6integration,
+  qt6platform-plugins,
+  qt6mpris,
   ffmpeg,
   libvlc,
+  qt6Packages,
   taglib,
   SDL2,
   gst_all_1,
@@ -23,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "deepin-music";
-  version = "7.0.3";
+  version = "7.0.9";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-MLfkSO8ru8MKiwgiQ0mPO3zGlnIeSHPc0Op5jjzJ6PE=";
+    hash = "sha256-tj0XICmp7sM2m6aSf/DgxS7JXO3Wy/83sZIPGV17gFo=";
   };
 
   patches = [ "${src}/patches/fix-library-path.patch" ];
@@ -37,20 +33,20 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    qt6Packages.qttools
+    qt6Packages.wrapQtAppsHook
   ];
 
   buildInputs =
     [
-      dtkwidget
-      dtkdeclarative
-      qt5integration
-      qt5platform-plugins
-      udisks2-qt5
-      qtmpris
-      qtmultimedia
-      kcodecs
+      dtk6widget
+      dtk6declarative
+      qt6integration
+      qt6platform-plugins
+      qt6mpris
+      qt6Packages.qtbase
+      qt6Packages.qt5compat
+      qt6Packages.qtmultimedia
       ffmpeg
       libvlc
       taglib
@@ -69,18 +65,19 @@ stdenv.mkDerivation rec {
     "-I${libvlc}/include/vlc"
   ];
 
-  strictDeps = true;
+  # qtmultimedia can't not be found with strictDeps
+  strictDeps = false;
 
   preFixup = ''
     qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Awesome music player with brilliant and tweakful UI Deepin-UI based";
     mainProgram = "deepin-music";
     homepage = "https://github.com/linuxdeepin/deepin-music";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = teams.deepin.members;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.deepin.members;
   };
 }

pkgs/desktops/deepin/default.nix

@@ -38,6 +38,7 @@ let
       dtk6log = callPackage ./library/dtk6log { };
       qt6platform-plugins = callPackage ./library/qt6platform-plugins { };
       qt6integration = callPackage ./library/qt6integration { };
+      qt6mpris = callPackage ./library/qt6mpris { };
 
       #### CORE
       deepin-kwin = callPackage ./core/deepin-kwin { };

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

@@ -0,0 +1,46 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  qt6Packages,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "qt6mpris";
+  version = "1.0.0.1-1deepin1";
+
+  src = fetchFromGitHub {
+    owner = "deepin-community";
+    repo = "qt6mpris";
+    rev = finalAttrs.version;
+    hash = "sha256-PCdA9q/txaL2Fbr2/4+Z7L4zxWeULl3bq8MVH3i1g3g=";
+  };
+
+  postPatch = ''
+    substituteInPlace src/src.pro \
+      --replace-fail '$$[QT_INSTALL_LIBS]'    "$out/lib" \
+      --replace-fail '$$[QT_INSTALL_HEADERS]' "$out/include" \
+      --replace-fail '$$[QMAKE_MKSPECS]'      "$out/mkspecs"
+    substituteInPlace declarative/declarative.pro \
+      --replace-fail '$$[QT_INSTALL_QML]'     "$out/${qt6Packages.qtbase.qtQmlPrefix}"
+  '';
+
+  nativeBuildInputs = [
+    qt6Packages.qmake
+  ];
+
+  dontWrapQtApps = true;
+
+  buildInputs = [
+    qt6Packages.qtbase
+    qt6Packages.qtdeclarative
+  ];
+
+  meta = {
+    description = "Qt and QML MPRIS interface and adaptor";
+    homepage = "https://github.com/deepin-community/qt6mpris";
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.deepin.members;
+  };
+})