diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/deepin/apps')
18 files changed, 240 insertions, 152 deletions
diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-album/default.nix b/nixpkgs/pkgs/desktops/deepin/apps/deepin-album/default.nix index 49e2919c2fc0..59fa2c8c7bdf 100644 --- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-album/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-album/default.nix @@ -6,39 +6,29 @@ , qttools , wrapQtAppsHook , dtkwidget +, dtkdeclarative , qt5integration , qt5platform-plugins , qtbase , qtsvg , udisks2-qt5 , gio-qt -, image-editor -, glibmm , freeimage -, opencv , ffmpeg , ffmpegthumbnailer }: stdenv.mkDerivation rec { pname = "deepin-album"; - version = "5.10.9"; + version = "6.0.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-S/oVRD72dtpnvfGV6YfN5/syrmWA44H/1BbmAe0xjAY="; + hash = "sha256-kRQiH6LvXDpQOgBQiFHM+YQzQFSupOj98aEPbcUumZ8="; }; - # This patch should be removed after upgrading to 6.0.0 - postPatch = '' - substituteInPlace libUnionImage/CMakeLists.txt \ - --replace "/usr" "$out" - substituteInPlace src/CMakeLists.txt \ - --replace "/usr" "$out" - ''; - nativeBuildInputs = [ cmake pkg-config @@ -48,16 +38,14 @@ stdenv.mkDerivation rec { buildInputs = [ dtkwidget + dtkdeclarative qt5integration qt5platform-plugins qtbase qtsvg udisks2-qt5 gio-qt - image-editor - glibmm freeimage - opencv ffmpeg ffmpegthumbnailer ]; diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-camera/default.nix b/nixpkgs/pkgs/desktops/deepin/apps/deepin-camera/default.nix index f1b4485354ba..d62e8a6c91f1 100644 --- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-camera/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-camera/default.nix @@ -6,6 +6,8 @@ , qttools , wrapQtAppsHook , dtkwidget +, wayland +, dwayland , qt5integration , qt5platform-plugins , image-editor @@ -14,6 +16,7 @@ , ffmpeg , ffmpegthumbnailer , libusb1 +, libpciaccess , portaudio , libv4l , gst_all_1 @@ -22,13 +25,13 @@ stdenv.mkDerivation rec { pname = "deepin-camera"; - version = "6.0.2"; + version = "unstable-2023-09-26"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; - rev = version; - hash = "sha256-GQQFwlJNfdsi0GvDRMIorUnlbXrgbYl9H9aBedOm+ZQ="; + rev = "8ad3b6ad2a4f5f0b22a216496a0187a69a1e1bcc"; + hash = "sha256-/8ddplHJzeu7lrRzN66KhJGkFou4FcXc+BzYFK5YVeE="; }; # QLibrary and dlopen work with LD_LIBRARY_PATH @@ -52,6 +55,8 @@ stdenv.mkDerivation rec { buildInputs = [ dtkwidget + wayland + dwayland qt5integration qt5platform-plugins image-editor @@ -60,6 +65,7 @@ stdenv.mkDerivation rec { ffmpeg ffmpegthumbnailer libusb1 + libpciaccess portaudio libv4l ] ++ (with gst_all_1 ; [ diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-clone/default.nix b/nixpkgs/pkgs/desktops/deepin/apps/deepin-clone/default.nix index 9f322efcbf50..0f6cc03e48db 100644 --- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-clone/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-clone/default.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = teams.deepin.members; + broken = true; }; } diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/nixpkgs/pkgs/desktops/deepin/apps/deepin-compressor/default.nix index d716bc38bce2..e2ac4829db7c 100644 --- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-compressor/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-compressor/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , dtkwidget , qt5integration , qt5platform-plugins @@ -29,6 +30,14 @@ stdenv.mkDerivation rec { hash = "sha256-oOxto0X/GBAA9q691uwC0PtCdHDTMBqi80ov4xCXPn0="; }; + patches = [ + (fetchpatch { + name = "fix-build-failures-for-new-dtkgui.patch"; + url = "https://github.com/linuxdeepin/deepin-compressor/commit/0ee07030034b06021e366d8d6109f344d47ea26c.patch"; + hash = "sha256-P++SxzZCWoXJnLQhC0H/64/LjW/dqnl3hCGBWHVDn9Q="; + }) + ]; + postPatch = '' substituteInPlace src/source/common/pluginmanager.cpp \ --replace "/usr/lib/" "$out/lib/" diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/nixpkgs/pkgs/desktops/deepin/apps/deepin-editor/default.nix index 299319a0687a..6c02844c0ad5 100644 --- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-editor/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-editor/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "deepin-editor"; - version = "6.0.11"; + version = "6.0.15"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-OdKEskxrzFo4VOsR2+rsH3G63uqMmsBuXufayHWSQac="; + hash = "sha256-17loD7FNy5PwSxIyXk313yiMxO10rOeP94q08tm76gw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-image-viewer/0001-fix-install-path-for-nix.patch b/nixpkgs/pkgs/desktops/deepin/apps/deepin-image-viewer/0001-fix-install-path-for-nix.patch deleted file mode 100644 index 61d13556acb6..000000000000 --- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-image-viewer/0001-fix-install-path-for-nix.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c2fa29800c64f5bda04203bb2eb1845b29c1de3c Mon Sep 17 00:00:00 2001 -From: rewine <luhongxu@deepin.org> -Date: Fri, 25 Mar 2022 18:20:17 +0800 -Subject: [PATCH] fix install path for nix - ---- - qimage-plugins/libraw/CMakeLists.txt | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/qimage-plugins/libraw/CMakeLists.txt b/qimage-plugins/libraw/CMakeLists.txt -index 4bfd85ad..00d11bd3 100644 ---- a/qimage-plugins/libraw/CMakeLists.txt -+++ b/qimage-plugins/libraw/CMakeLists.txt -@@ -44,7 +44,6 @@ target_include_directories(xraw PUBLIC ${RAW_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIR - - target_link_libraries(${CMD_NAME} Qt5::Core Qt5::Gui raw) - --install(TARGETS ${CMD_NAME} DESTINATION ${Qt5Core_DIR}/../../qt5/plugins/imageformats) -- -+install(TARGETS ${CMD_NAME} DESTINATION qt5/plugins/imageformats) - - QT5_USE_MODULES(${PROJECT_NAME} Core Gui) --- -2.35.1 - diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix b/nixpkgs/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix index 0a2c84763f2e..7d7df4494a3a 100644 --- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix @@ -2,52 +2,42 @@ , lib , fetchFromGitHub , fetchpatch +, cmake +, pkg-config +, qttools +, wrapQtAppsHook +, qt5platform-plugins , qtbase -, qtsvg , dtkwidget -, qt5integration -, qt5platform-plugins +, dtkdeclarative +, deepin-ocr-plugin-manager , gio-qt , udisks2-qt5 , image-editor -, cmake -, pkg-config -, qttools -, wrapQtAppsHook , libraw , libexif +, freeimage }: stdenv.mkDerivation rec { pname = "deepin-image-viewer"; - version = "5.9.13"; + version = "6.0.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-T/hbygnbao5rbw0gHH0ULHOz/2j70ktyzYGWXPDCJoQ="; + hash = "sha256-YT3wK+ELXjgtsXbkiCjQF0zczQi89tF1kyIQtl9/mMA="; }; patches = [ - ./0001-fix-install-path-for-nix.patch - (fetchpatch { - name = "chore-use-GNUInstallDirs-in-CmakeLists.patch"; - url = "https://github.com/linuxdeepin/deepin-image-viewer/commit/4a046e6207fea306e592fddc33c1285cf719a63d.patch"; - sha256 = "sha256-aIgYmq6WDfCE+ZcD0GshxM+QmBWZGjh9MzZcTMrhBJ0="; - }) (fetchpatch { name = "fix-build-with-libraw-0_21.patch"; url = "https://raw.githubusercontent.com/archlinux/svntogit-community/2ff11979704dd7156a7e7c3bae9b30f08894063d/trunk/libraw-0.21.patch"; - sha256 = "sha256-I/w4uiANT8Z8ud/F9WCd3iRHOfplu3fpqnu8ZIs4C+w="; + hash = "sha256-I/w4uiANT8Z8ud/F9WCd3iRHOfplu3fpqnu8ZIs4C+w="; }) ]; - postPatch = '' - substituteInPlace src/com.deepin.ImageViewer.service \ - --replace "/usr/bin/deepin-image-viewer" "$out/bin/deepin-image-viewer" - ''; - nativeBuildInputs = [ cmake pkg-config @@ -56,16 +46,12 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - qtbase - qtsvg - dtkwidget - qt5integration qt5platform-plugins - gio-qt - udisks2-qt5 - image-editor + dtkwidget + dtkdeclarative + deepin-ocr-plugin-manager libraw - libexif + freeimage ]; strictDeps = true; diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix b/nixpkgs/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix index 0dda3c3860f7..7794d5b50d0b 100644 --- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix @@ -2,7 +2,6 @@ , lib , fetchFromGitHub , fetchpatch -, runtimeShell , cmake , pkg-config , wrapQtAppsHook @@ -31,45 +30,31 @@ , gst_all_1 , gtest , libpulseaudio +, runtimeShell }: stdenv.mkDerivation rec { pname = "deepin-movie-reborn"; - version = "5.10.28"; + version = "6.0.5"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-aILaiVkApXBKJUxvQ1k7CHzL3IOwshsTTjW5Ak31xEM="; + hash = "sha256-dWN2IVVpwYwzEuLtT3JvhzKiBwaBq4lzmaEhA9S1hjE="; }; patches = [ - (fetchpatch { - name = "feat-rewrite-libPath-to-read-LD_LIBRARY_PATH.patch"; - url = "https://github.com/linuxdeepin/deepin-movie-reborn/commit/432bf452ed244c256e99ecaf80bb6a0eef9b4a74.patch"; - sha256 = "sha256-5hRQ8D9twBKgouVpIBa1pdAGk0lI/wEdQaHBBHFCZBA"; - }) + ./dont_use_libPath.diff ]; postPatch = '' # https://github.com/linuxdeepin/deepin-movie-reborn/pull/198 substituteInPlace src/common/diskcheckthread.cpp \ --replace "/usr/include/linux/cdrom.h" "linux/cdrom.h" - substituteInPlace src/widgets/toolbox_proxy.cpp \ - --replace "/bin/bash" "${runtimeShell}" - - # libdmr always assume that these libraries exist - # otherwise it will lead to coredump - # This affects the preview plugin for dde-file-manager - - substituteInPlace src/libdmr/{filefilter.cpp,playlist_model.cpp,gstutils.cpp} \ - --replace 'LibraryLoader::libPath("libavcodec.so")' '"${lib.getLib ffmpeg}/lib/libavcodec.so"' \ - --replace 'LibraryLoader::libPath("libavformat.so")' '"${lib.getLib ffmpeg}/lib/libavformat.so"' \ - --replace 'LibraryLoader::libPath("libavutil.so")' '"${lib.getLib ffmpeg}/lib/libavutil.so"' \ - --replace 'LibraryLoader::libPath("libffmpegthumbnailer.so")' '"${lib.getLib ffmpegthumbnailer}/lib/libffmpegthumbnailer.so"' \ - --replace 'LibraryLoader::libPath("libgstreamer-1.0.so")' '"${lib.getLib gst_all_1.gstreamer}/lib/libgstreamer-1.0.so"' \ - --replace 'LibraryLoader::libPath("libgstpbutils-1.0.so")' '"${lib.getLib gst_all_1.gst-plugins-base}/lib/libgstpbutils-1.0.so"' + # https://github.com/linuxdeepin/deepin-movie-reborn/pull/337 + substituteInPlace src/libdmr/playlist_model.cpp \ + --replace "DGuiApplicationHelper" "Dtk::Gui::DGuiApplicationHelper" ''; outputs = [ "out" "dev" ]; @@ -90,7 +75,7 @@ stdenv.mkDerivation rec { qtdbusextended qtmpris gsettings-qt - elfutils.dev + elfutils ffmpeg ffmpegthumbnailer xorg.libXtst @@ -101,7 +86,7 @@ stdenv.mkDerivation rec { libdvdnav libunwind libva - zstd.dev + zstd mpv gtest libpulseaudio @@ -110,6 +95,12 @@ stdenv.mkDerivation rec { gst-plugins-base ]); + propagatedBuildInputs = [ + qtmultimedia + qtx11extras + ffmpegthumbnailer + ]; + env.NIX_CFLAGS_COMPILE = toString [ "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0" "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-movie-reborn/dont_use_libPath.diff b/nixpkgs/pkgs/desktops/deepin/apps/deepin-movie-reborn/dont_use_libPath.diff new file mode 100644 index 000000000000..7ea1f0da1b23 --- /dev/null +++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-movie-reborn/dont_use_libPath.diff @@ -0,0 +1,108 @@ +diff --git a/src/backends/mpv/mpv_proxy.h b/src/backends/mpv/mpv_proxy.h +index 1256a06..d76d1c0 100644 +--- a/src/backends/mpv/mpv_proxy.h ++++ b/src/backends/mpv/mpv_proxy.h +@@ -38,6 +38,7 @@ typedef void (*mpv_terminateDestroy)(mpv_handle *ctx); + + static QString libPath(const QString &sLib) + { ++ return sLib; + QDir dir; + QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); + dir.setPath(path); +diff --git a/src/common/hwdec_probe.cpp b/src/common/hwdec_probe.cpp +index d70ed0c..ac2516d 100644 +--- a/src/common/hwdec_probe.cpp ++++ b/src/common/hwdec_probe.cpp +@@ -83,6 +83,7 @@ bool HwdecProbe::isFileCanHwdec(const QUrl& url, QList<QString>& hwList) + + static QString libPath(const QString &sLib) + { ++ return sLib; + QDir dir; + QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); + dir.setPath(path); +diff --git a/src/common/platform/platform_thumbnail_worker.cpp b/src/common/platform/platform_thumbnail_worker.cpp +index 17b2bdd..82db2b9 100644 +--- a/src/common/platform/platform_thumbnail_worker.cpp ++++ b/src/common/platform/platform_thumbnail_worker.cpp +@@ -88,6 +88,7 @@ Platform_ThumbnailWorker::Platform_ThumbnailWorker() + + QString Platform_ThumbnailWorker::libPath(const QString &strlib) + { ++ return strlib; + QDir dir; + QString lib_path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); + dir.setPath(lib_path); +diff --git a/src/common/thumbnail_worker.cpp b/src/common/thumbnail_worker.cpp +index 2ba2888..c34841e 100644 +--- a/src/common/thumbnail_worker.cpp ++++ b/src/common/thumbnail_worker.cpp +@@ -88,6 +88,7 @@ ThumbnailWorker::ThumbnailWorker() + + QString ThumbnailWorker::libPath(const QString &strlib) + { ++ return strlib; + QDir dir; + QString lib_path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); + dir.setPath(lib_path); +diff --git a/src/libdmr/compositing_manager.cpp b/src/libdmr/compositing_manager.cpp +index 9b117fc..28a11ec 100644 +--- a/src/libdmr/compositing_manager.cpp ++++ b/src/libdmr/compositing_manager.cpp +@@ -237,6 +237,7 @@ bool CompositingManager::isCanHwdec() + + QString CompositingManager::libPath(const QString &sLib) + { ++ return sLib; + QDir dir; + QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); + dir.setPath(path); +diff --git a/src/libdmr/filefilter.cpp b/src/libdmr/filefilter.cpp +index 6691df0..b620a62 100644 +--- a/src/libdmr/filefilter.cpp ++++ b/src/libdmr/filefilter.cpp +@@ -72,6 +72,7 @@ FileFilter::FileFilter() + + QString FileFilter::libPath(const QString &strlib) + { ++ return strlib; + QDir dir; + QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); + dir.setPath(path); +diff --git a/src/libdmr/playlist_model.cpp b/src/libdmr/playlist_model.cpp +index 18a8095..9ea4abf 100644 +--- a/src/libdmr/playlist_model.cpp ++++ b/src/libdmr/playlist_model.cpp +@@ -449,6 +449,7 @@ PlaylistModel::PlaylistModel(PlayerEngine *e) + + QString PlaylistModel::libPath(const QString &strlib) + { ++ return strlib; + QDir dir; + QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); + dir.setPath(path); +diff --git a/src/widgets/platform/platform_toolbox_proxy.cpp b/src/widgets/platform/platform_toolbox_proxy.cpp +index 570acac..9da0f97 100644 +--- a/src/widgets/platform/platform_toolbox_proxy.cpp ++++ b/src/widgets/platform/platform_toolbox_proxy.cpp +@@ -709,6 +709,7 @@ private: + + static QString libPath(const QString &strlib) + { ++ return strlib; + QDir dir; + QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); + dir.setPath(path); +diff --git a/src/widgets/toolbox_proxy.cpp b/src/widgets/toolbox_proxy.cpp +index 05cbc2c..54731bf 100644 +--- a/src/widgets/toolbox_proxy.cpp ++++ b/src/widgets/toolbox_proxy.cpp +@@ -760,6 +760,7 @@ private: + + static QString libPath(const QString &strlib) + { ++ return strlib; + QDir dir; + QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); + dir.setPath(path); diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-music/default.nix b/nixpkgs/pkgs/desktops/deepin/apps/deepin-music/default.nix index 914e4e6671dc..64e5ee857745 100644 --- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-music/default.nix +++ b/nixpkgs/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 = '' diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-picker/default.nix b/nixpkgs/pkgs/desktops/deepin/apps/deepin-picker/default.nix index 0d710652e389..cafd235fc9f4 100644 --- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-picker/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-picker/default.nix @@ -6,20 +6,20 @@ , pkg-config , wrapQtAppsHook , dtkwidget +, qtbase , qtsvg , xorg -, qtbase }: stdenv.mkDerivation rec { pname = "deepin-picker"; - version = "5.0.28"; + version = "6.0.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-b463PqrCpt/DQqint5Xb0cRT66iHNPavj0lsTMv801k="; + hash = "sha256-DkSgeMALhwGeU5sDHuerpPpiN3/3m19jmwtwOjZvOVo="; }; nativeBuildInputs = [ @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + qtbase dtkwidget qtsvg xorg.libXtst diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/default.nix index 23891f8ab9c9..e477917f5a1b 100644 --- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-reader/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "deepin-reader"; - version = "6.0.2"; + version = "6.0.5"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-69NCxa20wp/tyyGGH/FbHhZ83LECbJWAzaLRo7iYreA="; + hash = "sha256-G5UZ8lBrUo5G3jMae70p/zi9kOVqHWMNCedOy45L1PA="; }; # don't use vendored htmltopdf diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix b/nixpkgs/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix index 1e41012dfc28..a0f83e7eb438 100644 --- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix @@ -24,25 +24,26 @@ , udev , gst_all_1 }: + stdenv.mkDerivation rec { pname = "deepin-screen-recorder"; - version = "5.12.1"; + version = "unstable-2023-07-10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; - rev = version; - sha256 = "sha256-43jqgiBa77UAes0ekMES6IqVOPVXfzfQQjePdxFkNDM="; + rev = "e8ee1e8330e2f3923e22acc952a0bd01bee94ad1"; + hash = "sha256-QHV3hSALXI4e31YBDXRSRgT8b/J8gwm024bzlPWu2FA="; }; patches = [ ./dont_use_libPath.diff ]; postPatch = '' - substituteInPlace screen_shot_recorder.pro deepin-screen-recorder.desktop \ - src/{src.pro,pin_screenshots/pin_screenshots.pro} \ - src/dde-dock-plugins/{shotstart/shotstart.pro,recordtime/recordtime.pro} \ - assets/com.deepin.Screenshot.service \ - --replace "/usr" "$out" + ( + shopt -s globstar + substituteInPlace **/*.pro **/*.service **/*.desktop \ + --replace "/usr/" "$out/" + ) ''; nativeBuildInputs = [ @@ -80,7 +81,7 @@ stdenv.mkDerivation rec { # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev gst_all_1.gstreamer libv4l ]}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev gst_all_1.gstreamer libv4l ffmpeg ffmpegthumbnailer ]}" ]; preFixup = '' diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff b/nixpkgs/pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff index 3707ab4c67c2..be3ba3267cbf 100644 --- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff +++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff @@ -1,8 +1,8 @@ diff --git a/src/gstrecord/gstinterface.cpp b/src/gstrecord/gstinterface.cpp -index b269b01..c075295 100644 +index 165a7ce..e1574a5 100644 --- a/src/gstrecord/gstinterface.cpp +++ b/src/gstrecord/gstinterface.cpp -@@ -48,6 +48,7 @@ gstInterface::gstInterface() +@@ -49,6 +49,7 @@ gstInterface::gstInterface() } QString gstInterface::libPath(const QString &sLib) { @@ -11,10 +11,10 @@ index b269b01..c075295 100644 QDir dir; QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); diff --git a/src/main_window.cpp b/src/main_window.cpp -index 7bfc78e..dcbbc2f 100755 +index e0f6bc5..757abad 100755 --- a/src/main_window.cpp +++ b/src/main_window.cpp -@@ -585,6 +585,7 @@ void MainWindow::initDynamicLibPath() +@@ -559,6 +559,7 @@ void MainWindow::initDynamicLibPath() } QString MainWindow::libPath(const QString &strlib) { @@ -23,7 +23,7 @@ index 7bfc78e..dcbbc2f 100755 QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); dir.setPath(path); diff --git a/src/waylandrecord/avlibinterface.cpp b/src/waylandrecord/avlibinterface.cpp -index d7942d6..c5cfdf4 100644 +index b4145fa..97a3f5c 100644 --- a/src/waylandrecord/avlibinterface.cpp +++ b/src/waylandrecord/avlibinterface.cpp @@ -105,6 +105,7 @@ avlibInterface::avlibInterface() @@ -31,6 +31,6 @@ index d7942d6..c5cfdf4 100644 QString avlibInterface::libPath(const QString &sLib) { + return sLib; - //qDebug() << sLib; QDir dir; QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); + dir.setPath(path); diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix b/nixpkgs/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix index 27b96a23937a..544e8e32b249 100644 --- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "deepin-screensaver"; - version = "5.0.16"; + version = "5.0.18"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-d/BllaXZxRdJe8nH+hhQIEutpBvAWFnBHWbIjznUfQU="; + hash = "sha256-7lyHPE/x7rmwh7FtCPkuA8JgYpy90jRXhUWoaeZpVag="; }; postPatch = '' @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { qmakeFlags = [ "XSCREENSAVER_DATA_PATH=${xscreensaver}/libexec/xscreensaver" - "COMPILE_ON_V23=false" + "COMPILE_ON_V23=true" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix b/nixpkgs/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix index c3ff184d9197..012d37a6cdef 100644 --- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix @@ -21,17 +21,19 @@ , util-linux , systemd , polkit +, wayland +, dwayland }: stdenv.mkDerivation rec { pname = "deepin-system-monitor"; - version = "5.9.33"; + version = "6.0.8"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-X7/YwnJyA/HOLsOGARjsHWgL2qxW1eU1TvoWulvz0j4="; + hash = "sha256-7XvS5HviK9XRsxTGnreYX9IQxxGWk7x7MHtcsHCz1rc="; }; postPatch = '' @@ -74,11 +76,12 @@ stdenv.mkDerivation rec { procps libpcap libnl + wayland + dwayland ]; cmakeFlags = [ "-DVERSION=${version}" - "-DUSE_DEEPIN_WAYLAND=OFF" ]; strictDeps = true; diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix b/nixpkgs/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix index 599baa24e436..dce0807faa97 100644 --- a/nixpkgs/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake , pkg-config , qttools @@ -16,22 +17,37 @@ , gst_all_1 , gtest }: + stdenv.mkDerivation rec { pname = "deepin-voice-note"; - version = "5.11.1"; + version = "6.0.13"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-JX4OuVu+5/a3IhkfnvaWVDaKl+xg/8qxlvp9hM0nHNU="; + hash = "sha256-yDlWyMGkSToGCN7tuZNR8Mz7MUOZ7355w4H0OzeHBrs="; }; + patches = [ + ./use_v23_dbus_interface.diff + (fetchpatch { + name = "Adjust-the-audio-port-available-range.patch"; + url = "https://github.com/linuxdeepin/deepin-voice-note/commit/a876e4c4cf7d77e50071246f9fb6998aa62def77.patch"; + hash = "sha256-J/PPdj1Am/v2Sw2Dv2XvZJAy/6Tf7OoTfrbOB9rc5m8="; + }) + (fetchpatch { + name = "fix-build-error-with-new-dtk.patch"; + url = "https://github.com/linuxdeepin/deepin-voice-note/commit/9ce211f603deaff21b881e1c4f43d53e33a85347.patch"; + hash = "sha256-oP+AzMniONxjYIFust8fGaD8/UOjKr4yZiRUkdTMd5w="; + }) + ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "/usr" "$out" substituteInPlace src/common/audiowatcher.cpp \ --replace "/usr/share" "$out/share" - substituteInPlace assets/deepin-voice-note.desktop \ - --replace "/usr/bin" "$out/bin" ''; nativeBuildInputs = [ @@ -61,8 +77,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVERSION=${version}" ]; - env.NIX_CFLAGS_COMPILE = "-I${dde-qt-dbus-factory}/include/libdframeworkdbus-2.0"; - preFixup = '' qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; diff --git a/nixpkgs/pkgs/desktops/deepin/apps/deepin-voice-note/use_v23_dbus_interface.diff b/nixpkgs/pkgs/desktops/deepin/apps/deepin-voice-note/use_v23_dbus_interface.diff new file mode 100644 index 000000000000..213b73e36b41 --- /dev/null +++ b/nixpkgs/pkgs/desktops/deepin/apps/deepin-voice-note/use_v23_dbus_interface.diff @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e7bfb81..f56f11a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -103,7 +103,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-all") + execute_process(COMMAND cat /etc/os-version OUTPUT_VARIABLE OS_INFO_STR) + string(REGEX MATCHALL "MajorVersion=[0-9]+" MAJOR_STR "${OS_INFO_STR}") + string(REGEX MATCH "[0-9]+" MAJOR_VERSION "${MAJOR_STR}") +-if (MAJOR_VERSION MATCHES "23") ++if (TRUE) + message("--------------------- OS_BUILD_V23 on") + add_definitions(-DOS_BUILD_V23) + endif() |