diff --git a/pkgs/by-name/li/libraw/package.nix b/pkgs/by-name/li/libraw/package.nix index 7b63fb45435e..700092119a7e 100644 --- a/pkgs/by-name/li/libraw/package.nix +++ b/pkgs/by-name/li/libraw/package.nix @@ -7,7 +7,6 @@ pkg-config, # for passthru.tests - deepin, freeimage, hdrmerge, imagemagick, @@ -43,7 +42,6 @@ stdenv.mkDerivation rec { passthru.tests = { inherit imagemagick hdrmerge freeimage; - inherit (deepin) deepin-image-viewer; inherit (python3.pkgs) rawkit; }; diff --git a/pkgs/desktops/deepin/apps/deepin-album/default.nix b/pkgs/desktops/deepin/apps/deepin-album/default.nix deleted file mode 100644 index 5e4cbf659bc2..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-album/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkwidget, - dtkdeclarative, - qt5integration, - qt5platform-plugins, - udisks2-qt5, - gio-qt, - freeimage, - ffmpeg_6, - ffmpegthumbnailer, -}: - -stdenv.mkDerivation rec { - pname = "deepin-album"; - version = "6.0.4"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-kTcVmROsqLH8GwJzAf3zMq/wGYWNvhFBiHODaROt7Do="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - dtkdeclarative - qt5integration - qt5platform-plugins - libsForQt5.qtbase - libsForQt5.qtsvg - udisks2-qt5 - gio-qt - freeimage - ffmpeg_6 - ffmpegthumbnailer - ]; - - strictDeps = true; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - meta = with lib; { - description = "Fashion photo manager for viewing and organizing pictures"; - homepage = "https://github.com/linuxdeepin/deepin-album"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-camera/default.nix b/pkgs/desktops/deepin/apps/deepin-camera/default.nix deleted file mode 100644 index 750696aee61a..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-camera/default.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkwidget, - wayland, - dwayland, - qt5integration, - qt5platform-plugins, - image-editor, - ffmpeg_6, - ffmpegthumbnailer, - libusb1, - libpciaccess, - portaudio, - libv4l, - gst_all_1, - systemd, -}: - -stdenv.mkDerivation rec { - pname = "deepin-camera"; - version = "6.0.5"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-3q8yV8GpCPKW780YpCn+xLeFBGJFoAMmKSFCAH9OXoE="; - }; - - # QLibrary and dlopen work with LD_LIBRARY_PATH - patches = [ ./dont_use_libPath.diff ]; - - postPatch = '' - substituteInPlace src/CMakeLists.txt \ - --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 libsForQt5.qttools}/bin/qdbus" \ - --replace "/usr/share" "$out/share" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = - [ - dtkwidget - wayland - dwayland - qt5integration - qt5platform-plugins - image-editor - libsForQt5.qtbase - libsForQt5.qtmultimedia - ffmpeg_6 - ffmpegthumbnailer - libusb1 - libpciaccess - portaudio - libv4l - ] - ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - ]); - - cmakeFlags = [ "-DVERSION=${version}" ]; - - strictDeps = true; - - 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" - ]; - - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - ffmpeg_6 - ffmpegthumbnailer - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - libusb1 - libv4l - portaudio - systemd - ] - }" - ]; - - preFixup = '' - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - ''; - - meta = { - description = "Tool to view camera, take photo and video"; - homepage = "https://github.com/linuxdeepin/deepin-camera"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - maintainers = lib.teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff b/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff deleted file mode 100644 index f8e005f577a3..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-camera/dont_use_libPath.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/src/gstvideowriter.cpp b/src/src/gstvideowriter.cpp -index c96c8b0..fcc11da 100644 ---- a/src/src/gstvideowriter.cpp -+++ b/src/src/gstvideowriter.cpp -@@ -282,6 +282,7 @@ void GstVideoWriter::loadAppSrcCaps() - - QString GstVideoWriter::libPath(const QString &strlib) - { -+ return strlib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); -diff --git a/src/src/mainwindow.cpp b/src/src/mainwindow.cpp -index d3c6c24..6d313a6 100644 ---- a/src/src/mainwindow.cpp -+++ b/src/src/mainwindow.cpp -@@ -784,6 +784,7 @@ void CMainWindow::slotPopupSettingsDialog() - - QString CMainWindow::libPath(const QString &strlib) - { -+ return strlib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); diff --git a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix deleted file mode 100644 index 8f15c0895182..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - cmake, - pkg-config, - libsForQt5, - qt5platform-plugins, - dtkwidget, - dtkdeclarative, - deepin-ocr-plugin-manager, - libraw, - freeimage, -}: - -stdenv.mkDerivation rec { - pname = "deepin-image-viewer"; - version = "6.0.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-YT3wK+ELXjgtsXbkiCjQF0zczQi89tF1kyIQtl9/mMA="; - }; - - patches = [ - (fetchpatch { - name = "fix-build-with-libraw-0_21.patch"; - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/2ff11979704dd7156a7e7c3bae9b30f08894063d/trunk/libraw-0.21.patch"; - hash = "sha256-I/w4uiANT8Z8ud/F9WCd3iRHOfplu3fpqnu8ZIs4C+w="; - }) - ]; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - qt5platform-plugins - dtkwidget - dtkdeclarative - deepin-ocr-plugin-manager - libraw - freeimage - ]; - - strictDeps = true; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - meta = with lib; { - description = "Image viewing tool with fashion interface and smooth performance"; - homepage = "https://github.com/linuxdeepin/deepin-image-viewer"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix deleted file mode 100644 index bc98fa4e4e4f..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix +++ /dev/null @@ -1,126 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkwidget, - qt5integration, - qt5platform-plugins, - gsettings-qt, - elfutils, - ffmpeg_6, - ffmpegthumbnailer, - mpv, - xorg, - pcre, - libdvdread, - libdvdnav, - libunwind, - libva, - zstd, - glib, - gst_all_1, - gtest, - libpulseaudio, -}: - -stdenv.mkDerivation rec { - pname = "deepin-movie-reborn"; - version = "6.0.10"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-1UbrNufetedla8TMFPze1hP/R2cZN7SEYEtrK4/5/RQ="; - }; - - patches = [ ./dont_use_libPath.diff ]; - - outputs = [ - "out" - "dev" - ]; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = - [ - dtkwidget - qt5integration - qt5platform-plugins - libsForQt5.qtx11extras - libsForQt5.qtmultimedia - libsForQt5.qtdbusextended - libsForQt5.qtmpris - gsettings-qt - elfutils - ffmpeg_6 - ffmpegthumbnailer - xorg.libXtst - xorg.libXdmcp - xorg.xcbproto - pcre.dev - libdvdread - libdvdnav - libunwind - libva - zstd - mpv - gtest - libpulseaudio - ] - ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - ]); - - propagatedBuildInputs = [ - libsForQt5.qtmultimedia - libsForQt5.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" - ]; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - strictDeps = true; - - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - mpv - ffmpeg_6 - ffmpegthumbnailer - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - ] - }" - ]; - - preFixup = '' - glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"} - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - ''; - - meta = with lib; { - description = "Full-featured video player supporting playing local and streaming media in multiple video formats"; - mainProgram = "deepin-movie"; - homepage = "https://github.com/linuxdeepin/deepin-movie-reborn"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - broken = true; # Crash when playing any video - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-movie-reborn/dont_use_libPath.diff b/pkgs/desktops/deepin/apps/deepin-movie-reborn/dont_use_libPath.diff deleted file mode 100644 index 7ea1f0da1b23..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-movie-reborn/dont_use_libPath.diff +++ /dev/null @@ -1,108 +0,0 @@ -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& 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/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix b/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix deleted file mode 100644 index 33d514f48c25..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - libsForQt5, - dtkwidget, - qt5integration, - dde-qt-dbus-factory, - image-editor, - gsettings-qt, - xorg, - libusb1, - libv4l, - ffmpeg, - ffmpegthumbnailer, - portaudio, - dwayland, - udev, - gst_all_1, -}: - -stdenv.mkDerivation rec { - pname = "deepin-screen-recorder"; - version = "6.0.6"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-nE+axTUxWCcgrxQ5y2cjkVswW2rwv/We0m7XgB4shko="; - }; - - patches = [ ./dont_use_libPath.diff ]; - - # disable dock plugins, it's part of dde-shell now - postPatch = '' - substituteInPlace screen_shot_recorder.pro \ - --replace-fail " src/dde-dock-plugins" "" - ( - shopt -s globstar - substituteInPlace **/*.pro **/*.service **/*.desktop \ - --replace-quiet "/usr/" "$out/" - ) - ''; - - nativeBuildInputs = [ - libsForQt5.qmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = - [ - dtkwidget - dde-qt-dbus-factory - qt5integration - libsForQt5.qtbase - libsForQt5.qtmultimedia - libsForQt5.qtx11extras - image-editor - gsettings-qt - xorg.libXdmcp - xorg.libXtst - xorg.libXcursor - libusb1 - libv4l - ffmpeg - ffmpegthumbnailer - portaudio - dwayland - udev - ] - ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - ]); - - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - udev - gst_all_1.gstreamer - libv4l - ffmpeg - ffmpegthumbnailer - ] - }" - ]; - - preFixup = '' - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - ''; - - meta = { - description = "Screen recorder application for dde"; - homepage = "https://github.com/linuxdeepin/deepin-screen-recorder"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - maintainers = lib.teams.deepin.members; - broken = true; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff b/pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff deleted file mode 100644 index be3ba3267cbf..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/src/gstrecord/gstinterface.cpp b/src/gstrecord/gstinterface.cpp -index 165a7ce..e1574a5 100644 ---- a/src/gstrecord/gstinterface.cpp -+++ b/src/gstrecord/gstinterface.cpp -@@ -49,6 +49,7 @@ gstInterface::gstInterface() - } - QString gstInterface::libPath(const QString &sLib) - { -+ return sLib; - qInfo() << "gstreamer lib name is " << sLib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); -diff --git a/src/main_window.cpp b/src/main_window.cpp -index e0f6bc5..757abad 100755 ---- a/src/main_window.cpp -+++ b/src/main_window.cpp -@@ -559,6 +559,7 @@ void MainWindow::initDynamicLibPath() - } - QString MainWindow::libPath(const QString &strlib) - { -+ return strlib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); -diff --git a/src/waylandrecord/avlibinterface.cpp b/src/waylandrecord/avlibinterface.cpp -index b4145fa..97a3f5c 100644 ---- a/src/waylandrecord/avlibinterface.cpp -+++ b/src/waylandrecord/avlibinterface.cpp -@@ -105,6 +105,7 @@ avlibInterface::avlibInterface() - - QString avlibInterface::libPath(const QString &sLib) - { -+ return sLib; - QDir dir; - QString path = QLibraryInfo::location(QLibraryInfo::LibrariesPath); - dir.setPath(path); diff --git a/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix b/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix deleted file mode 100644 index 46a35db365c2..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkwidget, - qt5integration, - qt5platform-plugins, - dde-qt-dbus-factory, - deepin-movie-reborn, - libvlc, - gst_all_1, - gtest, -}: - -stdenv.mkDerivation rec { - pname = "deepin-voice-note"; - version = "6.0.18"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-GbSYXwJoNfbg+31454GjMbXRqrtk2bSZJCk18ILfAn4="; - }; - - patches = [ ./use_v23_dbus_interface.diff ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "/usr" "$out" - substituteInPlace src/common/audiowatcher.cpp \ - --replace "/usr/share" "$out/share" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = - [ - libsForQt5.qtbase - libsForQt5.qtsvg - dtkwidget - qt5integration - qt5platform-plugins - dde-qt-dbus-factory - deepin-movie-reborn - libsForQt5.qtmultimedia - libsForQt5.qtwebengine - libvlc - gtest - ] - ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - ]); - - strictDeps = true; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - ] - }" - ]; - - preFixup = '' - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - ''; - - meta = { - description = "Simple memo software with texts and voice recordings"; - mainProgram = "deepin-voice-note"; - homepage = "https://github.com/linuxdeepin/deepin-voice-note"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - maintainers = lib.teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-voice-note/use_v23_dbus_interface.diff b/pkgs/desktops/deepin/apps/deepin-voice-note/use_v23_dbus_interface.diff deleted file mode 100644 index 213b73e36b41..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-voice-note/use_v23_dbus_interface.diff +++ /dev/null @@ -1,13 +0,0 @@ -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() diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index df3b8e7f3fc0..a7e01c215d11 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -21,13 +21,11 @@ let qt5platform-plugins = callPackage ./library/qt5platform-plugins { }; qt5integration = callPackage ./library/qt5integration { }; deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { }; - deepin-ocr-plugin-manager = callPackage ./library/deepin-ocr-plugin-manager { }; dwayland = callPackage ./library/dwayland { }; dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { }; disomaster = callPackage ./library/disomaster { }; docparser = callPackage ./library/docparser { }; gio-qt = callPackage ./library/gio-qt { }; - image-editor = callPackage ./library/image-editor { }; udisks2-qt5 = callPackage ./library/udisks2-qt5 { }; util-dfm = callPackage ./library/util-dfm { }; dtk6core = callPackage ./library/dtk6core { }; @@ -66,22 +64,16 @@ let dde-api-proxy = callPackage ./core/dde-api-proxy { }; #### Dtk Application - deepin-album = callPackage ./apps/deepin-album { }; deepin-calculator = callPackage ./apps/deepin-calculator { }; - deepin-camera = callPackage ./apps/deepin-camera { }; deepin-compressor = callPackage ./apps/deepin-compressor { }; deepin-draw = callPackage ./apps/deepin-draw { }; deepin-editor = callPackage ./apps/deepin-editor { }; - deepin-image-viewer = callPackage ./apps/deepin-image-viewer { }; - deepin-movie-reborn = callPackage ./apps/deepin-movie-reborn { }; deepin-music = callPackage ./apps/deepin-music { }; deepin-picker = callPackage ./apps/deepin-picker { }; - deepin-screen-recorder = callPackage ./apps/deepin-screen-recorder { }; deepin-shortcut-viewer = callPackage ./apps/deepin-shortcut-viewer { }; deepin-system-monitor = callPackage ./apps/deepin-system-monitor { }; deepin-terminal = callPackage ./apps/deepin-terminal { }; deepin-reader = callPackage ./apps/deepin-reader { }; - deepin-voice-note = callPackage ./apps/deepin-voice-note { }; deepin-screensaver = callPackage ./apps/deepin-screensaver { }; #### Go Packages @@ -116,6 +108,14 @@ let go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31 go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31 go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31 + deepin-movie-reborn = throw "'deepin.deepin-movie-reborn' has been removed as it was broken and unmaintained in nixpkgs, Please use 'vlc' instead"; # added 2025-01-16; + deepin-album = throw "'deepin.deepin-album' has been removed as it was broken and unmaintained in nixpkgs, Please use 'kdePackages.gwenview' instead"; # added 2025-01-16 + deepin-voice-note = throw "'deepin.deepin-voice-note' has been removed as it depending on deepin-movie-reborn which was broken"; # added 2025-01-16 + deepin-screen-recorder = throw "'deepin.deepin-screen-recorder' has been removed as it was broken and unmaintained in nixpkgs, Please use 'flameshot' or 'simplescreenrecorder' instead"; # added 2025-01-16 + deepin-ocr-plugin-manager = throw "'deepin.deepin-ocr-plugin-manager' has been removed as it was outdated"; # added 2025-01-16 + deepin-camera = throw "'deepin.deepin-camera' has been removed as it was unmaintained in nixpkgs, Please use 'snapshot' instead"; # added 2025-01-16 + deepin-image-viewer = throw "'deepin.deepin-image-viewer' has been removed as it was broken and unmaintained in nixpkgs, Please use 'kdePackages.gwenview' instead"; # added 2025-01-16 + image-editor = throw "'deepin.image-editor' has been removed as it was unmaintained in nixpkgs"; # added 2025-01-16 }; in lib.makeScope pkgs.newScope packages diff --git a/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix b/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix deleted file mode 100644 index 26549922bd8d..000000000000 --- a/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - cmake, - libsForQt5, - ncnn, - opencv, - vulkan-headers, -}: - -stdenv.mkDerivation rec { - pname = "deepin-ocr-plugin-manager"; - version = "unstable-2023-07-10"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = "9b5c9e57c83b5adde383ed404b73f9dcbf5e6a48"; - hash = "sha256-U5lxAKTaQvvlqbqRezPIcBGg+DpF1hZ204Y1+8dt14U="; - }; - - # don't use vendored opencv - postPatch = '' - substituteInPlace src/CMakeLists.txt \ - --replace "opencv_mobile" "opencv4" - substituteInPlace src/paddleocr-ncnn/paddleocr.cpp \ - --replace "/usr" "$out" - ''; - - nativeBuildInputs = [ - cmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - ncnn - opencv - vulkan-headers - ]; - - strictDeps = true; - - cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - ]; - - meta = with lib; { - description = "Plugin manager of optical character recognition for DDE"; - homepage = "https://github.com/linuxdeepin/deepin-ocr-plugin-manager"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/library/image-editor/default.nix b/pkgs/desktops/deepin/library/image-editor/default.nix deleted file mode 100644 index 1154b5e0e89c..000000000000 --- a/pkgs/desktops/deepin/library/image-editor/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - dtkwidget, - cmake, - libsForQt5, - pkg-config, - opencv, - freeimage, - libmediainfo, - ffmpegthumbnailer, - pcre, -}: - -stdenv.mkDerivation rec { - pname = "image-editor"; - version = "1.0.41"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-9V9B0YSUTWv/4IbTRtKJSVrZx6j8jqJxIIR9TwUZ0U0="; - }; - - postPatch = '' - substituteInPlace libimageviewer/CMakeLists.txt --replace '/usr' '$out' - substituteInPlace libimagevisualresult/CMakeLists.txt --replace '/usr' '$out' - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - opencv - freeimage - libmediainfo - ffmpegthumbnailer - pcre - ]; - - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; - - meta = with lib; { - description = "Image editor lib for dtk"; - homepage = "https://github.com/linuxdeepin/image-editor"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = teams.deepin.members; - }; -} diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix index 819f694fbd11..e04a1f4a2ab8 100644 --- a/pkgs/top-level/release-cuda.nix +++ b/pkgs/top-level/release-cuda.nix @@ -89,7 +89,6 @@ let cholmod-extra = linux; colmap = linux; ctranslate2 = linux; - deepin.image-editor = linux; ffmpeg-full = linux; gimp = linux; gpu-screen-recorder = linux;