diff options
| author | rewine <luhongxu@deepin.org> | 2023-09-27 11:52:11 +0800 |
|---|---|---|
| committer | rewine <luhongxu@deepin.org> | 2023-11-23 10:00:37 +0800 |
| commit | eed4e1692cad4fa0f9a906e48d844fc7310e29f7 (patch) | |
| tree | 759d4fc38cceb4ac04f0160ce043b43fdffa1561 /pkgs/desktops/deepin | |
| parent | aa4d16aa25b29eba35a29d642d28961ae761f328 (diff) | |
| download | nixlib-eed4e1692cad4fa0f9a906e48d844fc7310e29f7.tar nixlib-eed4e1692cad4fa0f9a906e48d844fc7310e29f7.tar.gz nixlib-eed4e1692cad4fa0f9a906e48d844fc7310e29f7.tar.bz2 nixlib-eed4e1692cad4fa0f9a906e48d844fc7310e29f7.tar.lz nixlib-eed4e1692cad4fa0f9a906e48d844fc7310e29f7.tar.xz nixlib-eed4e1692cad4fa0f9a906e48d844fc7310e29f7.tar.zst nixlib-eed4e1692cad4fa0f9a906e48d844fc7310e29f7.zip | |
deepin-music: 6.2.31 -> 7.0.3
Diffstat (limited to 'pkgs/desktops/deepin')
| -rw-r--r-- | pkgs/desktops/deepin/apps/deepin-music/default.nix | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/pkgs/desktops/deepin/apps/deepin-music/default.nix b/pkgs/desktops/deepin/apps/deepin-music/default.nix index 914e4e6671dc..64e5ee857745 100644 --- a/pkgs/desktops/deepin/apps/deepin-music/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-music/default.nix @@ -3,46 +3,38 @@ , fetchFromGitHub , cmake , pkg-config +, qttools , wrapQtAppsHook , dtkwidget +, dtkdeclarative , qt5integration , qt5platform-plugins -, dde-qt-dbus-factory , udisks2-qt5 , qtmpris -, qtdbusextended , qtmultimedia -, qttools , kcodecs , ffmpeg , libvlc -, libpulseaudio -, libcue , taglib -, gsettings-qt , SDL2 -, gtest , qtbase , gst_all_1 }: stdenv.mkDerivation rec { pname = "deepin-music"; - version = "6.2.31"; + version = "7.0.3"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-OXyHB47orv9ix+Jg0b7wciA6DWUsXzFmIg4SM+piO3c="; + hash = "sha256-MLfkSO8ru8MKiwgiQ0mPO3zGlnIeSHPc0Op5jjzJ6PE="; }; - postPatch = '' - substituteInPlace src/music-player/CMakeLists.txt \ - --replace "/usr/include/vlc" "${libvlc}/include/vlc" - substituteInPlace src/music-player/data/deepin-music.desktop \ - --replace "/usr/bin/deepin-music" "$out/bin/deepin-music" - ''; + patches = [ + "${src}/patches/fix-library-path.patch" + ]; nativeBuildInputs = [ cmake @@ -53,22 +45,17 @@ stdenv.mkDerivation rec { buildInputs = [ dtkwidget + dtkdeclarative qt5integration qt5platform-plugins - dde-qt-dbus-factory udisks2-qt5 qtmpris - qtdbusextended qtmultimedia kcodecs ffmpeg libvlc - libpulseaudio - libcue taglib - gsettings-qt SDL2 - gtest ] ++ (with gst_all_1; [ gstreamer gst-plugins-base @@ -79,6 +66,11 @@ stdenv.mkDerivation rec { "-DVERSION=${version}" ]; + env.NIX_CFLAGS_COMPILE = toString [ + "-I${libvlc}/include/vlc/plugins" + "-I${libvlc}/include/vlc" + ]; + strictDeps = true; preFixup = '' |