From 339306e6abcd7221ebd0ed103213c4c1194bd22d Mon Sep 17 00:00:00 2001 From: rewine Date: Fri, 20 Sep 2024 21:02:17 +0800 Subject: [PATCH] deepin.deepin-music: 7.0.3 -> 7.0.9 --- .../deepin/apps/deepin-music/default.nix | 51 +++++++++---------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/pkgs/desktops/deepin/apps/deepin-music/default.nix b/pkgs/desktops/deepin/apps/deepin-music/default.nix index 16dc19831085..9013306af657 100644 --- a/pkgs/desktops/deepin/apps/deepin-music/default.nix +++ b/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; }; }