From ecf338dbb4b4422d0f889eea2af5fa409d786be4 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 16 Jan 2025 17:31:05 +0800 Subject: [PATCH] deepin.deepin-screen-recorder: remove --- .../apps/deepin-screen-recorder/default.nix | 105 ------------------ .../dont_use_libPath.diff | 36 ------ pkgs/desktops/deepin/default.nix | 2 +- 3 files changed, 1 insertion(+), 142 deletions(-) delete mode 100644 pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-screen-recorder/dont_use_libPath.diff 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/default.nix b/pkgs/desktops/deepin/default.nix index 1719ed127fc1..918bc842c50b 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -74,7 +74,6 @@ let deepin-image-viewer = callPackage ./apps/deepin-image-viewer { }; 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 { }; @@ -116,6 +115,7 @@ let 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 }; in lib.makeScope pkgs.newScope packages