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/default.nix b/pkgs/desktops/deepin/default.nix index df3b8e7f3fc0..19a3eeb9967b 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -73,7 +73,6 @@ let 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 { }; @@ -116,6 +115,7 @@ 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"; # added 2025-01-16; }; in lib.makeScope pkgs.newScope packages