From 25303238b95d1eef8109aa76f8de084bf8eeb178 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Aug 2025 19:39:37 +0300 Subject: [PATCH] deepin: drop --- .../deepin/apps/deepin-calculator/default.nix | 54 ---- .../deepin/apps/deepin-compressor/default.nix | 71 ----- .../deepin/apps/deepin-draw/default.nix | 56 ---- .../deepin/apps/deepin-editor/default.nix | 63 ----- .../deepin/apps/deepin-music/default.nix | 82 ------ .../deepin/apps/deepin-picker/default.nix | 57 ---- .../0001-build-tests-with-cpp-14.patch | 13 - .../deepin/apps/deepin-reader/default.nix | 72 ------ .../apps/deepin-screensaver/default.nix | 65 ----- .../apps/deepin-shortcut-viewer/default.nix | 50 ---- .../apps/deepin-system-monitor/default.nix | 98 ------- .../deepin/apps/deepin-terminal/default.nix | 61 ----- .../artwork/dde-account-faces/default.nix | 30 --- .../artwork/deepin-desktop-theme/default.nix | 61 ----- .../artwork/deepin-gtk-theme/default.nix | 30 --- .../artwork/deepin-icon-theme/default.nix | 50 ---- .../artwork/deepin-sound-theme/default.nix | 27 -- .../artwork/deepin-wallpapers/default.nix | 47 ---- .../deepin/core/dde-api-proxy/default.nix | 51 ---- .../deepin/core/dde-app-services/default.nix | 70 ----- .../deepin/core/dde-appearance/default.nix | 76 ------ .../core/dde-application-manager/default.nix | 41 --- .../deepin/core/dde-calendar/default.nix | 66 ----- .../fix-wrapped-name-not-in-whitelist.diff | 13 - .../deepin/core/dde-clipboard/default.nix | 54 ---- .../core/dde-control-center/default.nix | 89 ------- .../deepin/core/dde-file-manager/default.nix | 155 ----------- .../patch_check_v23_interface.diff | 13 - .../deepin/core/dde-grand-search/default.nix | 82 ------ .../fix-dbus-path-for-daemon.diff | 9 - .../core/dde-gsettings-schemas/default.nix | 49 ---- .../deepin/core/dde-launchpad/default.nix | 55 ---- .../deepin/core/dde-network-core/default.nix | 55 ---- .../deepin/core/dde-polkit-agent/default.nix | 51 ---- .../deepin/core/dde-session-shell/default.nix | 111 -------- .../deepin/core/dde-session-ui/default.nix | 72 ------ .../deepin/core/dde-session/default.nix | 72 ------ .../deepin/core/dde-shell/default.nix | 106 -------- .../core/dde-shell/fix-path-for-nixos.diff | 17 -- .../deepin/core/dde-tray-loader/default.nix | 69 ----- .../deepin/core/dde-widgets/default.nix | 48 ---- .../0001-hardcode-fallback-background.diff | 15 -- .../deepin/core/deepin-kwin/default.nix | 98 ------- .../core/deepin-service-manager/default.nix | 41 --- .../core/dpa-ext-gnomekeyring/default.nix | 51 ---- pkgs/desktops/deepin/default.nix | 121 --------- .../deepin/go-package/dde-api/default.nix | 100 ------- .../dde-daemon/0001-dont-set-PATH.diff | 15 -- .../0002-fix-custom-wallpapers-path.diff | 25 -- .../0003-aviod-use-hardcode-path.diff | 92 ------- .../deepin/go-package/dde-daemon/default.nix | 165 ------------ .../deepin-desktop-schemas/default.nix | 57 ---- .../go-package/deepin-pw-check/default.nix | 74 ------ .../deepin/go-package/startdde/default.nix | 82 ------ .../library/dde-qt-dbus-factory/default.nix | 51 ---- .../deepin/library/deepin-pdfium/default.nix | 49 ---- .../deepin-wayland-protocols/default.nix | 32 --- .../deepin/library/disomaster/default.nix | 39 --- .../deepin/library/docparser/default.nix | 51 ---- .../deepin/library/dtk6core/default.nix | 98 ------- .../library/dtk6core/fix-pkgconfig-path.patch | 14 - .../library/dtk6core/fix-pri-path.patch | 17 -- .../library/dtk6declarative/default.nix | 76 ------ .../dtk6declarative/fix-pkgconfig-path.patch | 14 - .../dtk6declarative/fix-pri-path.patch | 15 -- .../deepin/library/dtk6gui/default.nix | 93 ------- .../library/dtk6gui/fix-pkgconfig-path.patch | 16 -- .../deepin/library/dtk6gui/fix-pri-path.patch | 17 -- .../deepin/library/dtk6log/default.nix | 61 ----- .../library/dtk6systemsettings/default.nix | 67 ----- .../deepin/library/dtk6widget/default.nix | 94 ------- .../dtk6widget/fix-pkgconfig-path.patch | 14 - .../library/dtk6widget/fix-pri-path.patch | 17 -- .../deepin/library/dtkcommon/default.nix | 30 --- .../deepin/library/dtkcore/default.nix | 95 ------- .../library/dtkcore/fix-pkgconfig-path.patch | 14 - .../deepin/library/dtkcore/fix-pri-path.patch | 17 -- .../deepin/library/dtkdeclarative/default.nix | 73 ------ .../dtkdeclarative/fix-pkgconfig-path.patch | 14 - .../library/dtkdeclarative/fix-pri-path.patch | 15 -- .../deepin/library/dtkgui/default.nix | 86 ------- .../library/dtkgui/fix-pkgconfig-path.patch | 16 -- .../deepin/library/dtkgui/fix-pri-path.patch | 17 -- .../deepin/library/dtklog/default.nix | 51 ---- .../deepin/library/dtkwidget/default.nix | 91 ------- .../dtkwidget/fix-pkgconfig-path.patch | 14 - .../library/dtkwidget/fix-pri-path.patch | 17 -- .../deepin/library/dwayland/default.nix | 54 ---- .../deepin/library/gio-qt/default.nix | 62 ----- .../deepin/library/qt5integration/default.nix | 55 ---- .../library/qt5platform-plugins/default.nix | 60 ----- .../deepin/library/qt6integration/default.nix | 62 ----- .../deepin/library/qt6mpris/default.nix | 46 ---- .../library/qt6platform-plugins/default.nix | 55 ---- .../library/treeland-protocols/default.nix | 34 --- .../deepin/library/udisks2-qt5/default.nix | 38 --- .../deepin/library/util-dfm/default.nix | 54 ---- .../misc/deepin-desktop-base/default.nix | 50 ---- .../distribution_logo_transparent.svg | 243 ------------------ .../tools/dde-device-formatter/default.nix | 59 ----- .../deepin/tools/deepin-anything/default.nix | 56 ---- .../tools/deepin-gettext-tools/default.nix | 49 ---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/linux-kernels.nix | 1 + 105 files changed, 2 insertions(+), 5711 deletions(-) delete mode 100644 pkgs/desktops/deepin/apps/deepin-calculator/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-compressor/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-draw/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-editor/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-music/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-picker/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch delete mode 100644 pkgs/desktops/deepin/apps/deepin-reader/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-screensaver/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix delete mode 100644 pkgs/desktops/deepin/apps/deepin-terminal/default.nix delete mode 100644 pkgs/desktops/deepin/artwork/dde-account-faces/default.nix delete mode 100644 pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix delete mode 100644 pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix delete mode 100644 pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix delete mode 100644 pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix delete mode 100644 pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-api-proxy/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-app-services/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-appearance/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-application-manager/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-calendar/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-calendar/fix-wrapped-name-not-in-whitelist.diff delete mode 100644 pkgs/desktops/deepin/core/dde-clipboard/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-control-center/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-file-manager/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-file-manager/patch_check_v23_interface.diff delete mode 100644 pkgs/desktops/deepin/core/dde-grand-search/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff delete mode 100644 pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-launchpad/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-network-core/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-polkit-agent/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-session-shell/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-session-ui/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-session/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-shell/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff delete mode 100644 pkgs/desktops/deepin/core/dde-tray-loader/default.nix delete mode 100644 pkgs/desktops/deepin/core/dde-widgets/default.nix delete mode 100644 pkgs/desktops/deepin/core/deepin-kwin/0001-hardcode-fallback-background.diff delete mode 100644 pkgs/desktops/deepin/core/deepin-kwin/default.nix delete mode 100644 pkgs/desktops/deepin/core/deepin-service-manager/default.nix delete mode 100644 pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix delete mode 100644 pkgs/desktops/deepin/default.nix delete mode 100644 pkgs/desktops/deepin/go-package/dde-api/default.nix delete mode 100644 pkgs/desktops/deepin/go-package/dde-daemon/0001-dont-set-PATH.diff delete mode 100644 pkgs/desktops/deepin/go-package/dde-daemon/0002-fix-custom-wallpapers-path.diff delete mode 100644 pkgs/desktops/deepin/go-package/dde-daemon/0003-aviod-use-hardcode-path.diff delete mode 100644 pkgs/desktops/deepin/go-package/dde-daemon/default.nix delete mode 100644 pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix delete mode 100644 pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix delete mode 100644 pkgs/desktops/deepin/go-package/startdde/default.nix delete mode 100644 pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix delete mode 100644 pkgs/desktops/deepin/library/deepin-pdfium/default.nix delete mode 100644 pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix delete mode 100644 pkgs/desktops/deepin/library/disomaster/default.nix delete mode 100644 pkgs/desktops/deepin/library/docparser/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtk6core/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtk6declarative/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtk6gui/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtk6log/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtk6systemsettings/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtk6widget/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtkcommon/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtkcore/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtkcore/fix-pkgconfig-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtkcore/fix-pri-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtkdeclarative/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtkdeclarative/fix-pkgconfig-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtkdeclarative/fix-pri-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtkgui/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtkgui/fix-pkgconfig-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtkgui/fix-pri-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtklog/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtkwidget/default.nix delete mode 100644 pkgs/desktops/deepin/library/dtkwidget/fix-pkgconfig-path.patch delete mode 100644 pkgs/desktops/deepin/library/dtkwidget/fix-pri-path.patch delete mode 100644 pkgs/desktops/deepin/library/dwayland/default.nix delete mode 100644 pkgs/desktops/deepin/library/gio-qt/default.nix delete mode 100644 pkgs/desktops/deepin/library/qt5integration/default.nix delete mode 100644 pkgs/desktops/deepin/library/qt5platform-plugins/default.nix delete mode 100644 pkgs/desktops/deepin/library/qt6integration/default.nix delete mode 100644 pkgs/desktops/deepin/library/qt6mpris/default.nix delete mode 100644 pkgs/desktops/deepin/library/qt6platform-plugins/default.nix delete mode 100644 pkgs/desktops/deepin/library/treeland-protocols/default.nix delete mode 100644 pkgs/desktops/deepin/library/udisks2-qt5/default.nix delete mode 100644 pkgs/desktops/deepin/library/util-dfm/default.nix delete mode 100644 pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix delete mode 100644 pkgs/desktops/deepin/misc/deepin-desktop-base/distribution_logo_transparent.svg delete mode 100644 pkgs/desktops/deepin/tools/dde-device-formatter/default.nix delete mode 100644 pkgs/desktops/deepin/tools/deepin-anything/default.nix delete mode 100644 pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix diff --git a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix deleted file mode 100644 index b3df5e8e6837..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - dtk6widget, - qt6integration, - qt6platform-plugins, - qt6Packages, - cmake, - pkg-config, - gtest, -}: - -stdenv.mkDerivation rec { - pname = "deepin-calculator"; - version = "6.5.7"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-p3tEUIM7rxYUVLl7ZaEm20IZWRMNi12AIj9mQe6iB5I="; - }; - - nativeBuildInputs = [ - cmake - qt6Packages.qttools - pkg-config - qt6Packages.wrapQtAppsHook - ]; - - buildInputs = [ - dtk6widget - qt6integration - qt6platform-plugins - qt6Packages.qtbase - qt6Packages.qtsvg - gtest - ]; - - # qtsvg can't not be found with strictDeps - strictDeps = false; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - meta = { - description = "Easy to use calculator for ordinary users"; - mainProgram = "deepin-calculator"; - homepage = "https://github.com/linuxdeepin/deepin-calculator"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix deleted file mode 100644 index 4fb62057f649..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - dtkwidget, - qt5integration, - qt5platform-plugins, - udisks2-qt5, - cmake, - pkg-config, - libsForQt5, - minizip, - libzip, - libuuid, - libarchive, -}: - -stdenv.mkDerivation rec { - pname = "deepin-compressor"; - version = "6.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-DUpYb1xNmWpBcKo9kajeVm/+z4yj2OBE+qOyEkCHbUI="; - }; - - postPatch = '' - substituteInPlace src/source/common/pluginmanager.cpp \ - --replace-fail "/usr/lib" "$out/lib" - substituteInPlace src/desktop/deepin-compressor.desktop \ - --replace-fail "/usr" "$out" - ''; - - nativeBuildInputs = [ - cmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - qt5integration - qt5platform-plugins - udisks2-qt5 - libsForQt5.kcodecs - libsForQt5.karchive - minizip - libzip - libuuid - libarchive - ]; - - cmakeFlags = [ - "-DVERSION=${version}" - "-DUSE_TEST=OFF" - ]; - - strictDeps = true; - - meta = with lib; { - description = "Fast and lightweight application for creating and extracting archives"; - mainProgram = "deepin-compressor"; - homepage = "https://github.com/linuxdeepin/deepin-compressor"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-draw/default.nix b/pkgs/desktops/deepin/apps/deepin-draw/default.nix deleted file mode 100644 index 87e3e2221b2d..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-draw/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkwidget, - qt5integration, - qt5platform-plugins, -}: - -stdenv.mkDerivation rec { - pname = "deepin-draw"; - version = "7.0.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-WeubXsshN4tUlIwEHTxHXv1L2dvJ2DZ6qtSPyiVtc98="; - }; - - postPatch = '' - substituteInPlace com.deepin.Draw.service \ - --replace "/usr/bin/deepin-draw" "$out/bin/deepin-draw" - ''; - - nativeBuildInputs = [ - cmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libsForQt5.qtbase - qt5integration - libsForQt5.qtsvg - dtkwidget - qt5platform-plugins - ]; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - strictDeps = true; - - meta = { - description = "Lightweight drawing tool for users to freely draw and simply edit images"; - mainProgram = "deepin-draw"; - homepage = "https://github.com/linuxdeepin/deepin-draw"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix deleted file mode 100644 index 6c8a108b60a8..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-editor/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - dtkwidget, - qt5integration, - qt5platform-plugins, - dde-qt-dbus-factory, - libchardet, - libuchardet, - libiconv, - libsForQt5, -}: - -stdenv.mkDerivation rec { - pname = "deepin-editor"; - version = "6.5.15"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-aMxEESZ/noGtEDpQZz1asR0M+wnAfQT1FXLaQB6B0Zs="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - qt5integration - qt5platform-plugins - libsForQt5.qtbase - libsForQt5.qtsvg - dde-qt-dbus-factory - libsForQt5.kcodecs - libsForQt5.syntax-highlighting - libchardet - libuchardet - libiconv - ]; - - strictDeps = true; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - # Fix build with icu4c: "error: parameter declared 'auto'" - env.NIX_CFLAGS_COMPILE = toString [ "--std=c++17" ]; - - meta = { - description = "Desktop text editor that supports common text editing features"; - homepage = "https://github.com/linuxdeepin/deepin-editor"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-music/default.nix b/pkgs/desktops/deepin/apps/deepin-music/default.nix deleted file mode 100644 index 1eeb0eb03bed..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-music/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - dtk6widget, - dtk6declarative, - qt6integration, - qt6platform-plugins, - qt6mpris, - ffmpeg_6, - libvlc, - qt6Packages, - taglib_1, - SDL2, - gst_all_1, -}: - -stdenv.mkDerivation rec { - pname = "deepin-music"; - version = "7.0.9"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-tj0XICmp7sM2m6aSf/DgxS7JXO3Wy/83sZIPGV17gFo="; - }; - - patches = [ "${src}/patches/fix-library-path.patch" ]; - - nativeBuildInputs = [ - cmake - pkg-config - qt6Packages.qttools - qt6Packages.wrapQtAppsHook - ]; - - buildInputs = [ - dtk6widget - dtk6declarative - qt6integration - qt6platform-plugins - qt6mpris - qt6Packages.qtbase - qt6Packages.qt5compat - qt6Packages.qtmultimedia - ffmpeg_6 - libvlc - taglib_1 - SDL2 - ] - ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - ]); - - cmakeFlags = [ "-DVERSION=${version}" ]; - - env.NIX_CFLAGS_COMPILE = toString [ - "-I${libvlc}/include/vlc/plugins" - "-I${libvlc}/include/vlc" - ]; - - # qtmultimedia can't not be found with strictDeps - strictDeps = false; - - preFixup = '' - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - ''; - - meta = { - description = "Awesome music player with brilliant and tweakful UI Deepin-UI based"; - mainProgram = "deepin-music"; - homepage = "https://github.com/linuxdeepin/deepin-music"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-picker/default.nix b/pkgs/desktops/deepin/apps/deepin-picker/default.nix deleted file mode 100644 index f69914782a1c..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-picker/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - qt6Packages, - dtk6widget, - xorg, -}: - -stdenv.mkDerivation rec { - pname = "deepin-picker"; - version = "6.0.4"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-TeUhDEldte5PJJe1l0q4wUTnnaXY052YP1JAhpLz/sA="; - }; - - nativeBuildInputs = [ - qt6Packages.qmake - qt6Packages.qttools - pkg-config - qt6Packages.wrapQtAppsHook - ]; - - buildInputs = [ - qt6Packages.qtbase - dtk6widget - qt6Packages.qtsvg - xorg.libXtst - ]; - - postPatch = '' - substituteInPlace com.deepin.Picker.service \ - --replace "/usr/bin/deepin-picker" "$out/bin/deepin-picker" - ''; - - qmakeFlags = [ - "BINDIR=${placeholder "out"}/bin" - "ICONDIR=${placeholder "out"}/share/icons/hicolor/scalable/apps" - "APPDIR=${placeholder "out"}/share/applications" - "DSRDIR=${placeholder "out"}/share/deepin-picker" - "DOCDIR=${placeholder "out"}/share/dman/deepin-picker" - ]; - - meta = { - description = "Color picker application"; - mainProgram = "deepin-picker"; - homepage = "https://github.com/linuxdeepin/deepin-picker"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch b/pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch deleted file mode 100644 index cf88eb6db074..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/tests.pro b/tests/tests2.pro -index 314cad227646..48f1c66ee3f7 100644 ---- a/tests/tests.pro -+++ b/tests/tests.pro -@@ -6,7 +6,7 @@ QT += core gui sql printsupport dbus testlib widgets - #QMAKE_CXXFLAGS += -g -fsanitize=undefined,address -O2 - #QMAKE_LFLAGS += -g -fsanitize=undefined,address -O2 - --CONFIG += c++11 link_pkgconfig resources_big testcase no_testcase_installs -+CONFIG += c++14 link_pkgconfig resources_big testcase no_testcase_installs - - #访问私有方法 -fno-access-control - QMAKE_CXXFLAGS += -g -Wall -fprofile-arcs -ftest-coverage -fno-access-control -O0 -fno-inline diff --git a/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/pkgs/desktops/deepin/apps/deepin-reader/default.nix deleted file mode 100644 index d9b50da42a19..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-reader/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - libsForQt5, - dtkwidget, - qt5integration, - qt5platform-plugins, - dde-qt-dbus-factory, - poppler, - libchardet, - libspectre, - openjpeg, - djvulibre, - gtest, -}: - -stdenv.mkDerivation rec { - pname = "deepin-reader"; - version = "6.0.5"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-G5UZ8lBrUo5G3jMae70p/zi9kOVqHWMNCedOy45L1PA="; - }; - - patches = [ ./0001-build-tests-with-cpp-14.patch ]; - - # don't use vendored htmltopdf - postPatch = '' - substituteInPlace deepin_reader.pro \ - --replace "SUBDIRS += htmltopdf" " " - substituteInPlace reader/document/Model.cpp \ - --replace "/usr/lib/deepin-reader/htmltopdf" "htmltopdf" - ''; - - nativeBuildInputs = [ - libsForQt5.qmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - qt5integration - qt5platform-plugins - dde-qt-dbus-factory - libsForQt5.qtwebengine - libsForQt5.karchive - poppler - libchardet - libspectre - djvulibre - openjpeg - gtest - ]; - - qmakeFlags = [ "DEFINES+=VERSION=${version}" ]; - - meta = with lib; { - description = "Simple memo software with texts and voice recordings"; - mainProgram = "deepin-reader"; - homepage = "https://github.com/linuxdeepin/deepin-reader"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix b/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix deleted file mode 100644 index 8162fef12ae5..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - libsForQt5, - dtkwidget, - dde-qt-dbus-factory, - xorg, - xscreensaver, -}: - -stdenv.mkDerivation rec { - pname = "deepin-screensaver"; - version = "5.0.18"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-7lyHPE/x7rmwh7FtCPkuA8JgYpy90jRXhUWoaeZpVag="; - }; - - postPatch = '' - patchShebangs {src,customscreensaver/deepin-custom-screensaver}/{generate_translations.sh,update_translations.sh} - - substituteInPlace src/{dbusscreensaver.cpp,com.deepin.ScreenSaver.service,src.pro} \ - customscreensaver/deepin-custom-screensaver/deepin-custom-screensaver.pro \ - --replace "/usr" "$out" \ - --replace "/etc" "$out/etc" - - substituteInPlace tools/preview/main.cpp \ - --replace "/usr/lib/xscreensaver" "${xscreensaver}/libexec/xscreensaver" - ''; - - nativeBuildInputs = [ - libsForQt5.qmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libsForQt5.qtbase - libsForQt5.qtx11extras - libsForQt5.qtdeclarative - dtkwidget - dde-qt-dbus-factory - xorg.libXScrnSaver - ]; - - qmakeFlags = [ - "XSCREENSAVER_DATA_PATH=${xscreensaver}/libexec/xscreensaver" - "COMPILE_ON_V23=true" - ]; - - meta = with lib; { - description = "Screensaver service developed by deepin"; - mainProgram = "deepin-screensaver"; - homepage = "https://github.com/linuxdeepin/deepin-screensaver"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix deleted file mode 100644 index 5a1b6123352c..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - dtkwidget, - qt5integration, - qt5platform-plugins, - pkg-config, - libsForQt5, -}: - -stdenv.mkDerivation rec { - pname = "deepin-shortcut-viewer"; - version = "5.0.9"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-A4LFi0KcqChjgYrO90paMBAivv02TsRjYQ26I0k71x0="; - }; - - nativeBuildInputs = [ - libsForQt5.qmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libsForQt5.qtbase - dtkwidget - qt5integration - qt5platform-plugins - ]; - - qmakeFlags = [ - "VERSION=${version}" - "PREFIX=${placeholder "out"}" - ]; - - meta = with lib; { - description = "Deepin Shortcut Viewer"; - mainProgram = "deepin-shortcut-viewer"; - homepage = "https://github.com/linuxdeepin/deepin-shortcut-viewer"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix deleted file mode 100644 index 08ef482ed783..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - deepin-gettext-tools, - libsForQt5, - dtkwidget, - qt5integration, - qt5platform-plugins, - dde-qt-dbus-factory, - dde-tray-loader, - gsettings-qt, - procps, - libpcap, - libnl, - util-linux, - systemd, - polkit, - wayland, - dwayland, -}: - -stdenv.mkDerivation rec { - pname = "deepin-system-monitor"; - version = "6.5.4"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-xLlWQaoKC+/jgDD9sBikh5Z1QqDuCFcMulo0vqxJM7k="; - }; - - postPatch = '' - substituteInPlace deepin-system-monitor-main/process/process_controller.cpp \ - deepin-system-monitor-main/process/priority_controller.cpp \ - deepin-system-monitor-main/service/service_manager.cpp \ - deepin-system-monitor-main/translations/policy/com.deepin.pkexec.deepin-system-monitor.policy \ - --replace "/usr/bin/kill" "${lib.getBin util-linux}/bin/kill" \ - --replace "/usr/bin/renice" "${lib.getBin util-linux}/bin/renice" \ - --replace '/usr/bin/systemctl' '${lib.getBin systemd}/systemctl' - - substituteInPlace deepin-system-monitor-main/{service/service_manager.cpp,process/{priority_controller.cpp,process_controller.cpp}} \ - --replace "/usr/bin/pkexec" "${lib.getBin polkit}/bin/pkexec" - - for file in $(grep -rl "/usr") - do - substituteInPlace $file \ - --replace "/usr" "$out" - done - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - deepin-gettext-tools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - qt5integration - qt5platform-plugins - libsForQt5.qtbase - libsForQt5.qtsvg - libsForQt5.qtx11extras - dde-qt-dbus-factory - dde-tray-loader - gsettings-qt - libsForQt5.polkit-qt - procps - libpcap - libnl - wayland - dwayland - ]; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - # To build with icu4c need at least c++17 - env.NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=incompatible-pointer-types" - "--std=c++17" - ]; - - strictDeps = true; - - meta = with lib; { - description = "More user-friendly system monitor"; - homepage = "https://github.com/linuxdeepin/deepin-system-monitor"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix deleted file mode 100644 index a17f588dea23..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - nixosTests, - dtkwidget, - qt5integration, - qt5platform-plugins, - cmake, - libsForQt5, - pkg-config, - libsecret, - chrpath, - lxqt, -}: - -stdenv.mkDerivation rec { - pname = "deepin-terminal"; - version = "6.0.17"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-T5tjjbNYUaiG9a5zMoKN6I0ec/WLftF2xwUPczlNwB8="; - }; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - nativeBuildInputs = [ - cmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - lxqt.lxqt-build-tools_0_13 - ]; - - buildInputs = [ - qt5integration - qt5platform-plugins - libsForQt5.qtbase - libsForQt5.qtsvg - dtkwidget - libsForQt5.qtx11extras - libsecret - chrpath - ]; - - strictDeps = true; - - passthru.tests.test = nixosTests.terminal-emulators.deepin-terminal; - - meta = { - description = "Terminal emulator with workspace, multiple windows, remote management, quake mode and other features"; - mainProgram = "deepin-terminal"; - homepage = "https://github.com/linuxdeepin/deepin-terminal"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix b/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix deleted file mode 100644 index f65580e40852..000000000000 --- a/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - stdenvNoCC, - lib, - fetchFromGitHub, -}: - -stdenvNoCC.mkDerivation rec { - pname = "dde-account-faces"; - version = "1.0.16"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-PtbEsFQl6M5Ouadxy9CTVh1Bmmect83NODO4Ks+ckKU="; - }; - - makeFlags = [ "PREFIX=${placeholder "out"}/var" ]; - - meta = with lib; { - description = "Account faces of deepin desktop environment"; - homepage = "https://github.com/linuxdeepin/dde-account-faces"; - license = with licenses; [ - gpl3Plus - cc0 - ]; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix deleted file mode 100644 index d52b7cb3b2f6..000000000000 --- a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - gtk3, - xcursorgen, - papirus-icon-theme, - libsForQt5, - hicolor-icon-theme, - deepin-icon-theme, -}: - -stdenv.mkDerivation rec { - pname = "deepin-desktop-theme"; - version = "1.0.13"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-uNeRAsPbgC7IHHBIlczPXhnwZI65Le70D9MsbH+6Fwk="; - }; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - nativeBuildInputs = [ - cmake - gtk3 - xcursorgen - ]; - - propagatedBuildInputs = [ - libsForQt5.breeze-icons - papirus-icon-theme - hicolor-icon-theme - deepin-icon-theme - ]; - - # breeze-icons propagates qtbase - dontWrapQtApps = true; - - dontDropIconThemeCache = true; - - preFixup = '' - for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme - done - ''; - - meta = with lib; { - description = "Provides a variety of well-designed theme resources"; - homepage = "https://github.com/linuxdeepin/deepin-desktop-theme"; - license = with licenses; [ - gpl3Plus - cc-by-sa-40 - ]; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix deleted file mode 100644 index 29ada16a2af6..000000000000 --- a/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - stdenvNoCC, - lib, - fetchFromGitHub, - gtk-engine-murrine, -}: - -stdenvNoCC.mkDerivation rec { - pname = "deepin-gtk-theme"; - version = "23.11.23"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "deepin-gtk-theme"; - rev = version; - hash = "sha256-2B2BtbPeg3cEbnEIgdGFzy8MjCMWlbP/Sq4jzG5cjmc="; - }; - - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - meta = with lib; { - description = "Deepin GTK Theme"; - homepage = "https://github.com/linuxdeepin/deepin-gtk-theme"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix deleted file mode 100644 index 34e6cb0a7079..000000000000 --- a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - stdenvNoCC, - lib, - fetchFromGitHub, - gtk3, - xcursorgen, - papirus-icon-theme, -}: - -stdenvNoCC.mkDerivation rec { - pname = "deepin-icon-theme"; - version = "2024.07.31"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-Vt2rYZthGelXVUp8/L57ZlDsVEjjZhCv+kSGeU6nC2s="; - }; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - nativeBuildInputs = [ - gtk3 - xcursorgen - ]; - - propagatedBuildInputs = [ papirus-icon-theme ]; - - # breeze-icons propagates qtbase - dontWrapQtApps = true; - - dontDropIconThemeCache = true; - - # Remove broken symbolic link(https://github.com/linuxdeepin/developer-center/issues/11245) - preFixup = '' - rm $out/share/icons/bloom/actions/24/{draw-triangle1.svg,draw-triangle2.svg,draw-triangle3.svg,draw-triangle4.svg} - for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme - done - ''; - - meta = with lib; { - description = "Provides the base icon themes on deepin"; - homepage = "https://github.com/linuxdeepin/deepin-icon-theme"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix deleted file mode 100644 index 2256b8f1aba8..000000000000 --- a/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - stdenvNoCC, - lib, - fetchFromGitHub, -}: - -stdenvNoCC.mkDerivation rec { - pname = "deepin-sound-theme"; - version = "15.10.6"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-BvG/ygZfM6sDuDSzAqwCzDXGT/bbA6Srlpg3br117OU="; - }; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - meta = with lib; { - description = "Freedesktop sound theme for Deepin"; - homepage = "https://github.com/linuxdeepin/deepin-sound-theme"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix deleted file mode 100644 index 10203fc02f07..000000000000 --- a/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - dde-api, -}: - -stdenv.mkDerivation rec { - pname = "deepin-wallpapers"; - version = "1.7.16"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-o5rg1l8N6Ch+BdBLp+HMbVBBvrTdRtn8NSgH/9AnB2Q="; - }; - - nativeBuildInputs = [ dde-api ]; - - postPatch = '' - substituteInPlace Makefile \ - --replace /usr/lib/deepin-api/image-blur ${dde-api}/lib/deepin-api/image-blur - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/wallpapers/deepin - cp deepin/* $out/share/wallpapers/deepin - mkdir -p $out/share/wallpapers/image-blur - cp image-blur/* $out/share/wallpapers/image-blur - mkdir -p $out/share/backgrounds - ln -s $out/share/wallpapers/deepin/desktop.jpg $out/share/backgrounds/default_background.jpg - runHook postInstall - ''; - - meta = with lib; { - description = "Deepin-wallpapers provides wallpapers of dde"; - homepage = "https://github.com/linuxdeepin/deepin-wallpapers"; - license = with licenses; [ - gpl3Plus - cc-by-sa-30 - ]; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-api-proxy/default.nix b/pkgs/desktops/deepin/core/dde-api-proxy/default.nix deleted file mode 100644 index 80af772b00c4..000000000000 --- a/pkgs/desktops/deepin/core/dde-api-proxy/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkcore, - coreutils, -}: - -stdenv.mkDerivation rec { - pname = "dde-api-proxy"; - version = "1.0.20"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "dde-api-proxy"; - rev = version; - hash = "sha256-QE31BOh2LFlY6te+2+nSHGbhLsikSX8V7xSvcLzCWRA="; - }; - - postPatch = '' - for file in $(grep -rl "/usr/bin/false"); do - substituteInPlace $file --replace-fail "/usr/bin/false" "${coreutils}/bin/false" - done - for file in $(grep -rl "/usr/lib/dde-api-proxy"); do - substituteInPlace $file --replace-fail "/usr/lib/dde-api-proxy" "$out/lib/dde-api-proxy" - done - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.wrapQtAppsHook - libsForQt5.polkit-qt - ]; - - buildInputs = [ - dtkcore - libsForQt5.qtbase - ]; - - meta = { - description = "Proxy service for dde"; - homepage = "https://github.com/linuxdeepin/dde-api-proxy"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-app-services/default.nix b/pkgs/desktops/deepin/core/dde-app-services/default.nix deleted file mode 100644 index 9d3187e653b0..000000000000 --- a/pkgs/desktops/deepin/core/dde-app-services/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - dtkwidget, - qt5integration, - qt5platform-plugins, - cmake, - libsForQt5, - doxygen, -}: - -stdenv.mkDerivation rec { - pname = "dde-app-services"; - version = "1.0.25"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-/lHiSUOTD8nC0WDLAHAFzm1YC0WjSS5W5JNC0cjeVEo="; - }; - - postPatch = '' - substituteInPlace dconfig-center/dde-dconfig-daemon/services/org.desktopspec.ConfigManager.service \ - --replace "/usr/bin/dde-dconfig-daemon" "$out/bin/dde-dconfig-daemon" - substituteInPlace dconfig-center/dde-dconfig/main.cpp \ - --replace "/bin/dde-dconfig-editor" "dde-dconfig-editor" - substituteInPlace dconfig-center/CMakeLists.txt \ - --replace 'add_subdirectory("example")' " " \ - --replace 'add_subdirectory("tests")' " " - - substituteInPlace dconfig-center/dde-dconfig-daemon/services/dde-dconfig-daemon.service \ - --replace "/usr/bin" "$out/bin" \ - --replace "/usr/share" "/run/current-system/sw/share" - ''; - - nativeBuildInputs = [ - cmake - libsForQt5.qttools - doxygen - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - qt5integration - qt5platform-plugins - ]; - - cmakeFlags = [ - "-DDVERSION=${version}" - "-DDSG_DATA_DIR=/run/current-system/sw/share/dsg" - "-DQCH_INSTALL_DESTINATION=${placeholder "out"}/${libsForQt5.qtbase.qtDocPrefix}" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} - ''; - - meta = with lib; { - description = "Provids dbus service for reading and writing DSG configuration"; - homepage = "https://github.com/linuxdeepin/dde-app-services"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-appearance/default.nix b/pkgs/desktops/deepin/core/dde-appearance/default.nix deleted file mode 100644 index e40b9b287a31..000000000000 --- a/pkgs/desktops/deepin/core/dde-appearance/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkgui, - gsettings-qt, - gtk3, - xorg, - iconv, -}: - -stdenv.mkDerivation rec { - pname = "dde-appearance"; - version = "1.1.29"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-M39EugV0uGCIaXK4isTQpHd6Rh2Vl6sg3Jp8JIEFEE4="; - }; - - postPatch = '' - substituteInPlace src/service/impl/appearancemanager.cpp \ - src/service/modules/{api/compatibleengine.cpp,subthemes/customtheme.cpp,background/backgrounds.cpp} \ - misc/dconfig/org.deepin.dde.appearance.json \ - fakewm/dbus/deepinwmfaker.cpp \ - --replace "/usr/share" "/run/current-system/sw/share" - - for file in $(grep -rl "/usr/bin/dde-appearance"); do - substituteInPlace $file --replace "/usr/bin/dde-appearance" "$out/bin/dde-appearance" - done - - substituteInPlace src/service/modules/api/themethumb.cpp \ - --replace "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api" - - substituteInPlace fakewm/dbus/deepinwmfaker.cpp \ - --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" - - substituteInPlace src/service/modules/api/locale.cpp \ - --replace "/usr/share/locale/locale.alias" "${iconv}/share/locale/locale.alias" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkgui - gsettings-qt - gtk3 - libsForQt5.kconfig - libsForQt5.kwindowsystem - libsForQt5.kglobalaccel - xorg.libXcursor - xorg.xcbutilcursor - ]; - - cmakeFlags = [ - "-DDSG_DATA_DIR=/run/current-system/sw/share/dsg" - "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" - ]; - - meta = with lib; { - description = "Program used to set the theme and appearance of deepin desktop"; - homepage = "https://github.com/linuxdeepin/dde-appearance"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-application-manager/default.nix b/pkgs/desktops/deepin/core/dde-application-manager/default.nix deleted file mode 100644 index 70806aacaa3c..000000000000 --- a/pkgs/desktops/deepin/core/dde-application-manager/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - qt6Packages, - dtk6core, -}: - -stdenv.mkDerivation rec { - pname = "dde-application-manager"; - version = "1.2.19"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-KUwX7oilV562WDxkBhTQhwz2lgcQIYwkmRRglWj0zh8="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - qt6Packages.wrapQtAppsNoGuiHook - ]; - - buildInputs = [ - qt6Packages.qtbase - dtk6core - ]; - - meta = with lib; { - description = "Application manager for DDE"; - mainProgram = "dde-application-manager"; - homepage = "https://github.com/linuxdeepin/dde-application-manager"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-calendar/default.nix b/pkgs/desktops/deepin/core/dde-calendar/default.nix deleted file mode 100644 index 7ff4a3ff4ebf..000000000000 --- a/pkgs/desktops/deepin/core/dde-calendar/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkwidget, - qt5integration, - qt5platform-plugins, - dde-qt-dbus-factory, - libical, - sqlite, - runtimeShell, -}: - -stdenv.mkDerivation rec { - pname = "dde-calendar"; - version = "5.14.4"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-bZxNOBtLjop0eYxpMeoomaWYvPcMyDfQfgGPK9m+ARo="; - }; - - patches = [ ./fix-wrapped-name-not-in-whitelist.diff ]; - - postPatch = '' - for file in $(grep -rl "/bin/bash"); do - substituteInPlace $file --replace "/bin/bash" "${runtimeShell}" - done - ''; - - nativeBuildInputs = [ - cmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - qt5integration - qt5platform-plugins - dtkwidget - libsForQt5.qtbase - libsForQt5.qtsvg - dde-qt-dbus-factory - libical - sqlite - ]; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - strictDeps = true; - - meta = with lib; { - description = "Calendar for Deepin Desktop Environment"; - mainProgram = "dde-calendar"; - homepage = "https://github.com/linuxdeepin/dde-calendar"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-calendar/fix-wrapped-name-not-in-whitelist.diff b/pkgs/desktops/deepin/core/dde-calendar/fix-wrapped-name-not-in-whitelist.diff deleted file mode 100644 index a139c4690a89..000000000000 --- a/pkgs/desktops/deepin/core/dde-calendar/fix-wrapped-name-not-in-whitelist.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/calendar-service/src/dbusservice/dservicebase.cpp b/calendar-service/src/dbusservice/dservicebase.cpp -index ac182881..93a9c2d8 100644 ---- a/calendar-service/src/dbusservice/dservicebase.cpp -+++ b/calendar-service/src/dbusservice/dservicebase.cpp -@@ -52,6 +52,8 @@ bool DServiceBase::clientWhite(const int index) - return true; - } - } -+ if (getClientName().contains("dde-calendar")) -+ return true; - return false; - #else - Q_UNUSED(index) diff --git a/pkgs/desktops/deepin/core/dde-clipboard/default.nix b/pkgs/desktops/deepin/core/dde-clipboard/default.nix deleted file mode 100644 index e49d55388557..000000000000 --- a/pkgs/desktops/deepin/core/dde-clipboard/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - dtkwidget, - gio-qt, - cmake, - extra-cmake-modules, - libsForQt5, - wayland, - dwayland, - pkg-config, - glibmm, - gtest, -}: - -stdenv.mkDerivation rec { - pname = "dde-clipboard"; - version = "6.0.11"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-VSwip3WgpOYvqGw7/A8bqsYrVSACrVgoIp/pjXSAKcU="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - gio-qt - wayland - dwayland - glibmm - gtest - ]; - - cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ]; - - meta = with lib; { - description = "DDE optional clipboard manager componment"; - homepage = "https://github.com/linuxdeepin/dde-clipboard"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-control-center/default.nix b/pkgs/desktops/deepin/core/dde-control-center/default.nix deleted file mode 100644 index a3f6e7ea28c5..000000000000 --- a/pkgs/desktops/deepin/core/dde-control-center/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - doxygen, - wayland-scanner, - wayland, - dtkwidget, - qt5integration, - qt5platform-plugins, - libsForQt5, - deepin-pw-check, - libxcrypt, - gtest, - runtimeShell, -}: - -stdenv.mkDerivation rec { - pname = "dde-control-center"; - version = "6.0.65"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-9v2UtLjQQ3OX69UxMknLlrQhorahDI4Z4EEHItBs7G0="; - }; - - postPatch = '' - substituteInPlace src/plugin-accounts/operation/accountsworker.cpp \ - --replace "/bin/bash" "${runtimeShell}" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - doxygen - libsForQt5.wrapQtAppsHook - wayland-scanner - ]; - - buildInputs = [ - wayland - dtkwidget - qt5platform-plugins - qt5integration - deepin-pw-check - libsForQt5.qtbase - libsForQt5.qtmultimedia - libsForQt5.polkit-qt - libxcrypt - gtest - ]; - - env.PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; - - cmakeFlags = [ - "-DCVERSION=${version}" - "-DDISABLE_AUTHENTICATION=YES" - "-DDISABLE_UPDATE=YES" - "-DDISABLE_LANGUAGE=YES" - "-DBUILD_DOCS=OFF" - "-DMODULE_READ_DIR=/run/current-system/sw/lib/dde-control-center/modules" - "-DLOCALSTATE_READ_DIR=/var" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} - ''; - - outputs = [ - "out" - "dev" - ]; - - meta = { - description = "Control panel of Deepin Desktop Environment"; - mainProgram = "dde-control-center"; - homepage = "https://github.com/linuxdeepin/dde-control-center"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-file-manager/default.nix b/pkgs/desktops/deepin/core/dde-file-manager/default.nix deleted file mode 100644 index 39ad39418075..000000000000 --- a/pkgs/desktops/deepin/core/dde-file-manager/default.nix +++ /dev/null @@ -1,155 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - runtimeShell, - dtkwidget, - qt5integration, - qt5platform-plugins, - dde-qt-dbus-factory, - docparser, - dde-tray-loader, - cmake, - libsForQt5, - pkg-config, - ffmpegthumbnailer, - libsecret, - libmediainfo, - mediainfo, - libzen, - poppler, - polkit, - wrapGAppsHook3, - lucenepp, - boost, - taglib, - cryptsetup, - glib, - util-dfm, - deepin-pdfium, - libuuid, - libselinux, - glibmm, - pcre, - udisks2, - libisoburn, - gsettings-qt, -}: - -stdenv.mkDerivation rec { - pname = "dde-file-manager"; - version = "6.0.57"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-laM6PgNdUNbsqbzKFGWk7DPuAWR+XHo0eXKG0CDuc9c="; - }; - - nativeBuildInputs = [ - cmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - wrapGAppsHook3 - ]; - dontWrapGApps = true; - - patches = [ - ./patch_check_v23_interface.diff - (fetchpatch { - name = "fix-permission-to-execute-dde-file-manager.patch"; - url = "https://github.com/linuxdeepin/dde-file-manager/commit/b78cc4bd08dd487f67c5a332a2a2f4d20b3798c7.patch"; - hash = "sha256-Tw3iu6sU0rrsM78WGMBpBgvA9YdRTM1ObjCxyM928F4="; - }) - ]; - - postPatch = '' - patchShebangs tests/*.sh \ - assets/scripts \ - src/*.sh \ - src/plugins/daemon/daemonplugin-accesscontrol/help.sh \ - src/apps/dde-file-manager/dde-property-dialog \ - src/apps/dde-desktop/data/applications/dfm-open.sh - - substituteInPlace assets/scripts/file-manager.sh \ - --replace-fail "/usr/libexec/dde-file-manager" "$out/libexec/dde-file-manager" - - substituteInPlace src/plugins/filemanager/dfmplugin-vault/utils/vaultdefine.h \ - --replace-fail "/usr/bin/deepin-compressor" "deepin-compressor" - - substituteInPlace src/plugins/filemanager/dfmplugin-avfsbrowser/utils/avfsutils.cpp \ - --replace-fail "/usr/bin/mountavfs" "mountavfs" \ - --replace-fail "/usr/bin/umountavfs" "umountavfs" - - substituteInPlace src/plugins/common/core/dfmplugin-menu/{extendmenuscene/extendmenu/dcustomactionparser.cpp,oemmenuscene/oemmenu.cpp} \ - --replace-fail "/usr" "$out" - - substituteInPlace src/tools/upgrade/dialog/processdialog.cpp \ - --replace-fail "/usr/bin/dde-file-manager" "dde-file-manager" \ - --replace-fail "/usr/bin/dde-desktop" "dde-desktop" - - substituteInPlace src/dfm-base/file/local/localfilehandler.cpp \ - --replace-fail "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" - - substituteInPlace src/plugins/desktop/ddplugin-background/backgroundservice.cpp \ - src/plugins/desktop/ddplugin-wallpapersetting/wallpapersettings.cpp \ - --replace-fail "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds" - - find . -type f -regex ".*\\.\\(service\\|policy\\|desktop\\)" -exec sed -i -e "s|/usr/|$out/|g" {} \; - ''; - - buildInputs = [ - dtkwidget - qt5integration - qt5platform-plugins - deepin-pdfium - util-dfm - dde-qt-dbus-factory - glibmm - docparser - dde-tray-loader - libsForQt5.qtx11extras - libsForQt5.qtmultimedia - libsForQt5.kcodecs - ffmpegthumbnailer - libsecret - libmediainfo - mediainfo - poppler - libsForQt5.polkit-qt - polkit - lucenepp - boost - taglib - cryptsetup - libuuid - libselinux - pcre - udisks2 - libisoburn - gsettings-qt - ]; - - cmakeFlags = [ - "-DVERSION=${version}" - "-DNIX_DEEPIN_VERSION=23" - "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" - ]; - - enableParallelBuilding = true; - - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - meta = with lib; { - description = "File manager for deepin desktop environment"; - homepage = "https://github.com/linuxdeepin/dde-file-manager"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-file-manager/patch_check_v23_interface.diff b/pkgs/desktops/deepin/core/dde-file-manager/patch_check_v23_interface.diff deleted file mode 100644 index c41306f59031..000000000000 --- a/pkgs/desktops/deepin/core/dde-file-manager/patch_check_v23_interface.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8a8cfb079..34092aa57 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,7 +31,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - endif() - - #Indentify the version --if (${DEEPIN_OS_VERSION} MATCHES "23") -+if (${NIX_DEEPIN_VERSION} MATCHES "23") - add_definitions(-DCOMPILE_ON_V23) - set(COMPLIE_ON_V23 TRUE) - message("COMPILE ON v23") diff --git a/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/pkgs/desktops/deepin/core/dde-grand-search/default.nix deleted file mode 100644 index 2acc258f6247..000000000000 --- a/pkgs/desktops/deepin/core/dde-grand-search/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - libsForQt5, - pkg-config, - dtkwidget, - dde-qt-dbus-factory, - dde-tray-loader, - deepin-pdfium, - qt5integration, - qt5platform-plugins, - taglib_1, - ffmpeg, - ffmpegthumbnailer, - pcre, - lucenepp, - boost, -}: - -stdenv.mkDerivation rec { - pname = "dde-grand-search"; - version = "5.5.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-6s6M0cL8gjq1B5tuIRGPi8D69p4T8hPJv5QvBIvsO1w="; - }; - - nativeBuildInputs = [ - cmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - dde-tray-loader - dde-qt-dbus-factory - deepin-pdfium - qt5integration - qt5platform-plugins - taglib_1 - ffmpeg - ffmpegthumbnailer - pcre - lucenepp - boost - ]; - - patches = [ - # This patch revert the commit e6735e7 - # FIXME: why StartManager can't work, is dde-api-proxy still required? - ./fix-dbus-path-for-daemon.diff - ]; - - postPatch = '' - # fix access permit to daemon - substituteInPlace src/libgrand-search-daemon/dbusservice/grandsearchinterface.cpp \ - --replace-fail "/usr/bin/dde-grand-search" "$out/bin/.dde-grand-search-wrapped" - - for file in $(grep -rl "/usr/bin/dde-grand-search"); do - substituteInPlace $file --replace-fail "/usr/bin/dde-grand-search" "$out/bin/dde-grand-search" - done - - substituteAllInPlace src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service - ''; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - meta = { - description = "System-wide desktop search for DDE"; - homepage = "https://github.com/linuxdeepin/dde-grand-search"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff b/pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff deleted file mode 100644 index dd036bf6ec5e..000000000000 --- a/pkgs/desktops/deepin/core/dde-grand-search/fix-dbus-path-for-daemon.diff +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service b/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service -index 14823cb..33dd51e 100644 ---- a/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service -+++ b/src/grand-search-daemon/data/com.deepin.dde.daemon.GrandSearch.service -@@ -1,3 +1,3 @@ - [D-BUS Service] - Name=com.deepin.dde.daemon.GrandSearch --Exec=/usr/bin/dbus-send --print-reply --session --dest=com.deepin.SessionManager /com/deepin/StartManager com.deepin.StartManager.Launch string:/usr/share/applications/dde-grand-search-daemon.desktop -+Exec=@out@/bin/dde-grand-search-daemon diff --git a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix deleted file mode 100644 index 6b8f892ed39b..000000000000 --- a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - runCommand, - glib, - dde-grand-search, - startdde, - dde-session-shell, - dde-file-manager, - dde-tray-loader, - deepin-desktop-schemas, - deepin-system-monitor, - gsettings-desktop-schemas, - extraGSettingsOverrides ? "", - extraGSettingsOverridePackages ? [ ], -}: - -let - gsettingsOverridePackages = [ - dde-grand-search - startdde - dde-session-shell - dde-file-manager - dde-tray-loader - deepin-desktop-schemas - deepin-system-monitor - gsettings-desktop-schemas # dde-appearance need org.gnome.desktop.background - ] - ++ extraGSettingsOverridePackages; - -in -# TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this -runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; } '' - data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides" - schema_dir="$data_dir/glib-2.0/schemas" - - mkdir -p $schema_dir - - ${lib.concatMapStringsSep "\n" ( - pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"$schema_dir\"" - ) gsettingsOverridePackages} - - chmod -R a+w "$data_dir" - - cat - > "$schema_dir/nixos-defaults.gschema.override" <<- EOF - ${extraGSettingsOverrides} - EOF - - ${glib.dev}/bin/glib-compile-schemas $schema_dir -'' diff --git a/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/pkgs/desktops/deepin/core/dde-launchpad/default.nix deleted file mode 100644 index a8d8cbbd5042..000000000000 --- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - qt6Packages, - qt6integration, - qt6platform-plugins, - dtk6declarative, - dde-shell, -}: - -stdenv.mkDerivation rec { - pname = "dde-launchpad"; - version = "1.0.8"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-2arO1WSILY5TVPBvdyhttssddwhMYIBcCGq/pW/DnB0="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - qt6Packages.qttools - qt6Packages.wrapQtAppsHook - ]; - - buildInputs = [ - qt6integration - qt6platform-plugins - dtk6declarative - dde-shell - ] - ++ (with qt6Packages; [ - qtbase - qtsvg - qtwayland - appstream-qt - ]); - - cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ]; - - meta = { - description = "'launcher' or 'start menu' component for DDE"; - mainProgram = "dde-launchpad"; - homepage = "https://github.com/linuxdeepin/dde-launchpad"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-network-core/default.nix b/pkgs/desktops/deepin/core/dde-network-core/default.nix deleted file mode 100644 index 03e3173e6325..000000000000 --- a/pkgs/desktops/deepin/core/dde-network-core/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - dtkwidget, - dde-control-center, - dde-session-shell, - libsForQt5, - glib, - gtest, -}: - -stdenv.mkDerivation rec { - pname = "dde-network-core"; - version = "2.0.34"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-bS/PkutP5BQtqZ6MzeImFyGKoztoTswXhXaEftEv0FI="; - }; - - nativeBuildInputs = [ - cmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libsForQt5.qtbase - libsForQt5.qtsvg - dtkwidget - dde-control-center - dde-session-shell - libsForQt5.networkmanager-qt - glib - gtest - ]; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - strictDeps = true; - - meta = { - description = "DDE network library framework"; - homepage = "https://github.com/linuxdeepin/dde-network-core"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix deleted file mode 100644 index 39bd5fa8ea42..000000000000 --- a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - dtkwidget, - qt5integration, - qt5platform-plugins, - dde-qt-dbus-factory, - pkg-config, - cmake, - libsForQt5, -}: - -stdenv.mkDerivation rec { - pname = "dde-polkit-agent"; - version = "6.0.7"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-r2WVyy1lqcBJIQnRsPWlBFWQtSeZkq98J1S4dkipCys="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - qt5integration - qt5platform-plugins - dde-qt-dbus-factory - libsForQt5.polkit-qt - ]; - - postFixup = '' - wrapQtApp $out/lib/polkit-1-dde/dde-polkit-agent - ''; - - meta = with lib; { - description = "PolicyKit agent for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-polkit-agent"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-session-shell/default.nix b/pkgs/desktops/deepin/core/dde-session-shell/default.nix deleted file mode 100644 index e2ffff5407a5..000000000000 --- a/pkgs/desktops/deepin/core/dde-session-shell/default.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - linkFarm, - cmake, - pkg-config, - libsForQt5, - wrapGAppsHook3, - dtkwidget, - qt5integration, - qt5platform-plugins, - deepin-pw-check, - gsettings-qt, - lightdm_qt, - linux-pam, - xorg, - gtest, - xkeyboard_config, - dbus, - dde-session-shell, -}: - -stdenv.mkDerivation rec { - pname = "dde-session-shell"; - version = "6.0.21"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - # DDE 23 releases has moved to `linuxdeepin/dde-session-shell-snipe` - repo = "dde-session-shell-snipe"; - rev = version; - hash = "sha256-v0+Bz6J77Kgf4YV1iDhCqhmcNn493GFq1IEQbXBAVUU="; - }; - - postPatch = '' - substituteInPlace scripts/lightdm-deepin-greeter files/wayland/lightdm-deepin-greeter-wayland \ - --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" - - substituteInPlace src/session-widgets/auth_module.h \ - --replace "/usr/lib/dde-control-center" "/run/current-system/sw/lib/dde-control-center" - - substituteInPlace src/global_util/modules_loader.cpp \ - --replace "/usr/lib/dde-session-shell/modules" "/run/current-system/sw/lib/dde-session-shell/modules" - - substituteInPlace src/{session-widgets/{lockcontent.cpp,userinfo.cpp},widgets/fullscreenbackground.cpp} \ - --replace "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds" - - substituteInPlace src/global_util/xkbparser.h \ - --replace "/usr/share/X11/xkb/rules/base.xml" "${xkeyboard_config}/share/X11/xkb/rules/base.xml" - - substituteInPlace files/{org.deepin.dde.ShutdownFront1.service,org.deepin.dde.LockFront1.service} \ - --replace "/usr/bin/dbus-send" "${dbus}/bin/dbus-send" \ - --replace "/usr/share" "$out/share" - - substituteInPlace src/global_util/{public_func.cpp,constants.h} scripts/lightdm-deepin-greeter files/{dde-lock.desktop,lightdm-deepin-greeter.desktop,wayland/lightdm-deepin-greeter-wayland.desktop} \ - --replace "/usr" "$out" - - patchShebangs files/deepin-greeter - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - wrapGAppsHook3 - ]; - dontWrapGApps = true; - - buildInputs = [ - libsForQt5.qtbase - dtkwidget - qt5integration - qt5platform-plugins - deepin-pw-check - gsettings-qt - lightdm_qt - libsForQt5.qtx11extras - linux-pam - xorg.libXcursor - xorg.libXtst - xorg.libXrandr - xorg.libXdmcp - gtest - ]; - - outputs = [ - "out" - "dev" - ]; - - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - passthru.xgreeters = linkFarm "deepin-greeter-xgreeters" [ - { - path = "${dde-session-shell}/share/xgreeters/lightdm-deepin-greeter.desktop"; - name = "lightdm-deepin-greeter.desktop"; - } - ]; - - meta = with lib; { - description = "Deepin desktop-environment - session-shell module"; - homepage = "https://github.com/linuxdeepin/dde-session-shell"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-session-ui/default.nix b/pkgs/desktops/deepin/core/dde-session-ui/default.nix deleted file mode 100644 index 106e8fe80e52..000000000000 --- a/pkgs/desktops/deepin/core/dde-session-ui/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkwidget, - qt5integration, - qt5platform-plugins, - dde-tray-loader, - gsettings-qt, - gtest, -}: - -stdenv.mkDerivation rec { - pname = "dde-session-ui"; - version = "6.0.20"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-3twtJ1KT7TqpyLopHqPY2Lo8oZsH9liir0SJUV/k3OU="; - }; - - postPatch = '' - substituteInPlace widgets/fullscreenbackground.cpp \ - --replace "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds" \ - --replace "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers" - - substituteInPlace dde-warning-dialog/src/org.deepin.dde.WarningDialog1.service dde-welcome/src/org.deepin.dde.Welcome1.service \ - --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" - - substituteInPlace dmemory-warning-dialog/src/org.deepin.dde.MemoryWarningDialog1.service \ - --replace "/usr" "$out" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libsForQt5.qtbase - dtkwidget - qt5platform-plugins - qt5integration - dde-tray-loader - gsettings-qt - libsForQt5.qtx11extras - gtest - ]; - - cmakeFlags = [ "-DDISABLE_SYS_UPDATE=ON" ]; - - postFixup = '' - for binary in $out/lib/deepin-daemon/*; do - wrapProgram $binary "''${qtWrapperArgs[@]}" - done - ''; - - meta = with lib; { - description = "Deepin desktop-environment - Session UI module"; - homepage = "https://github.com/linuxdeepin/dde-session-ui"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-session/default.nix b/pkgs/desktops/deepin/core/dde-session/default.nix deleted file mode 100644 index 6a69822abbb5..000000000000 --- a/pkgs/desktops/deepin/core/dde-session/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkcore, - gsettings-qt, - libsecret, - xorg, - systemd, - dde-polkit-agent, -}: - -stdenv.mkDerivation rec { - pname = "dde-session"; - version = "1.2.12"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-WiWG4f+vMgAYDBp/porjiV9a6ZqqdmxdXAqX1ISdlfU="; - }; - - postPatch = '' - substituteInPlace misc/CMakeLists.txt \ - --replace "/etc" "$out/etc" - - # Avoid using absolute path to distinguish applications - substituteInPlace src/dde-session/impl/sessionmanager.cpp \ - --replace 'file.readAll().startsWith("/usr/bin/dde-lock")' 'file.readAll().contains("dde-lock")' \ - - substituteInPlace systemd/dde-session-initialized.target.wants/dde-polkit-agent.service \ - --replace "/usr/lib/polkit-1-dde" "${dde-polkit-agent}/lib/polkit-1-dde" - - for file in $(grep -rl "/usr/lib/deepin-daemon"); do - substituteInPlace $file --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" - done - - for file in $(grep -rl "/usr/bin"); do - substituteInPlace $file --replace "/usr/bin/" "/run/current-system/sw/bin/" - done - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libsForQt5.qtbase - dtkcore - gsettings-qt - libsecret - xorg.libXcursor - systemd - ]; - - # FIXME: dde-wayland always exits abnormally - passthru.providedSessions = [ "dde-x11" ]; - - meta = with lib; { - description = "New deepin session based on systemd and existing projects"; - homepage = "https://github.com/linuxdeepin/dde-session"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-shell/default.nix b/pkgs/desktops/deepin/core/dde-shell/default.nix deleted file mode 100644 index 026e2da584bf..000000000000 --- a/pkgs/desktops/deepin/core/dde-shell/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - cmake, - extra-cmake-modules, - pkg-config, - wayland-scanner, - dtk6declarative, - dtk6widget, - dde-qt-dbus-factory, - qt6Packages, - qt6integration, - qt6platform-plugins, - dde-tray-loader, - dde-application-manager, - wayland, - wayland-protocols, - treeland-protocols, - yaml-cpp, - xorg, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dde-shell"; - version = "1.0.10"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "dde-shell"; - rev = finalAttrs.version; - hash = "sha256-0nyTvSIJglx8raehPi6pYfQcxIjsCAaD1hVbuGvtfY8="; - }; - - patches = [ - ./fix-path-for-nixos.diff - (fetchpatch { - name = "resolve-compilation-issues-on-Qt-6_9.patch"; - url = "https://github.com/linuxdeepin/dde-shell/commit/936d62a2c20398b9ca6ae28f9101dd288c8b1678.patch"; - hash = "sha256-u5TcPy2kZsOLGUgjTGZ5JX3mWnr/rOQ3SWBRyjWEiw4="; - }) - (fetchpatch { - name = "adapt-import-change-of-QtQml-Models-in-Qt-6_9.patch"; - url = "https://github.com/linuxdeepin/dde-shell/commit/ad92c160508a5eb53fd5af558ef1b1ba881b97ac.patch"; - hash = "sha256-3GdkbFEt51EP04RQN54EDsGyXkeZoWhbnQAHkwjUeGY="; - }) - - ]; - - postPatch = '' - for file in $(grep -rl "/usr/lib/dde-dock"); do - substituteInPlace $file --replace-fail "/usr/lib/dde-dock" "/run/current-system/sw/lib/dde-dock" - done - - for file in $(grep -rl "/usr/lib/deepin-daemon"); do - substituteInPlace $file --replace-fail "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" - done - ''; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - qt6Packages.wrapQtAppsHook - qt6Packages.qttools - wayland-scanner - ]; - - buildInputs = [ - dde-tray-loader - dde-application-manager - dtk6declarative - dtk6widget - dde-qt-dbus-factory - qt6Packages.qtbase - qt6Packages.qtwayland - qt6Packages.qtsvg - qt6platform-plugins - qt6integration - wayland - wayland-protocols - treeland-protocols - yaml-cpp - xorg.libXcursor - xorg.libXres - ]; - - env.PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; - - cmakeFlags = [ "-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}" ]; - - qtWrapperArgs = [ - "--prefix TRAY_LOADER_EXECUTE_PATH : ${dde-tray-loader}/libexec/trayplugin-loader" - "--suffix DDE_SHELL_PLUGIN_PATH : /run/current-system/sw/lib/dde-shell" - "--suffix DDE_SHELL_PACKAGE_PATH : /run/current-system/sw/share/dde-shell" - ]; - - meta = { - description = "Plugin system that integrates plugins developed on DDE"; - homepage = "https://github.com/linuxdeepin/dde-shell"; - license = with lib.licenses; [ gpl3Plus ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ rewine ]; - }; -}) diff --git a/pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff b/pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff deleted file mode 100644 index cc334a3220a4..000000000000 --- a/pkgs/desktops/deepin/core/dde-shell/fix-path-for-nixos.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/misc/DDEShellConfig.cmake.in b/misc/DDEShellConfig.cmake.in -index e28cc2f..3875769 100644 ---- a/misc/DDEShellConfig.cmake.in -+++ b/misc/DDEShellConfig.cmake.in -@@ -5,9 +5,9 @@ find_dependency(Dtk@DTK_VERSION_MAJOR@Gui) - find_package(Qt@QT_VERSION_MAJOR@ COMPONENTS Qml Quick REQUIRED) - - include(${CMAKE_CURRENT_LIST_DIR}/DDEShellTargets.cmake) --set(DDE_SHELL_PACKAGE_INSTALL_DIR @CMAKE_INSTALL_PREFIX@/@DDE_SHELL_PACKAGE_INSTALL_DIR@) --set(DDE_SHELL_PLUGIN_INSTALL_DIR @CMAKE_INSTALL_PREFIX@/@DDE_SHELL_PLUGIN_INSTALL_DIR@) --set(DDE_SHELL_TRANSLATION_INSTALL_DIR @CMAKE_INSTALL_PREFIX@/@DDE_SHELL_TRANSLATION_INSTALL_DIR@) -+set(DDE_SHELL_PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/dde-shell) -+set(DDE_SHELL_PLUGIN_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/dde-shell) -+set(DDE_SHELL_TRANSLATION_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/dde-shell) - check_required_components(Dtk@DTK_VERSION_MAJOR@Core) - - include("${CMAKE_CURRENT_LIST_DIR}/DDEShellPackageMacros.cmake") diff --git a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix b/pkgs/desktops/deepin/core/dde-tray-loader/default.nix deleted file mode 100644 index 858924b5d140..000000000000 --- a/pkgs/desktops/deepin/core/dde-tray-loader/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - cmake, - extra-cmake-modules, - pkg-config, - dtkwidget, - dde-qt-dbus-factory, - qt5integration, - qt5platform-plugins, - wayland, - wayland-scanner, - xorg, - libsForQt5, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dde-tray-loader"; - version = "1.0.9"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "dde-tray-loader"; - rev = finalAttrs.version; - hash = "sha256-3rmLQRGtBLASr0VSsIfGP0R9HDxFlea+iNbVjkqKTVg="; - }; - - patches = [ - (fetchpatch { - name = "remove-useless-function.patch"; - url = "https://github.com/linuxdeepin/dde-tray-loader/commit/cf85f68db52472a0291bbbc3c298d7a2b701e4bc.patch"; - hash = "sha256-ks7Rg5kLQvo03XKbfQaqu/heP2yoVEbNO6UhDv99JBY="; - }) - ]; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - libsForQt5.wrapQtAppsHook - libsForQt5.qttools - wayland-scanner - ]; - - buildInputs = [ - dtkwidget - dde-qt-dbus-factory - qt5integration - qt5platform-plugins - libsForQt5.qtbase - libsForQt5.qtsvg - libsForQt5.qtwayland - libsForQt5.networkmanager-qt - libsForQt5.libdbusmenu - wayland - xorg.libXcursor - xorg.libXtst - ]; - - meta = { - description = "Tray plugins that integrated into task bar"; - homepage = "https://github.com/linuxdeepin/dde-tray-loader"; - license = with lib.licenses; [ gpl3Plus ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ rewine ]; - }; -}) diff --git a/pkgs/desktops/deepin/core/dde-widgets/default.nix b/pkgs/desktops/deepin/core/dde-widgets/default.nix deleted file mode 100644 index c63886c43ab4..000000000000 --- a/pkgs/desktops/deepin/core/dde-widgets/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - dde-qt-dbus-factory, - dtkwidget, - libsForQt5, - qt5integration, - gtest, -}: - -stdenv.mkDerivation rec { - pname = "dde-widgets"; - version = "6.0.23"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-aeWQdWi1mMche7AJhAvchRXu89hiZ+CM/RR9HvvbXTw="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - dde-qt-dbus-factory - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libsForQt5.qtbase - libsForQt5.qtx11extras - dtkwidget - qt5integration - gtest - ]; - - meta = with lib; { - description = "Desktop widgets service/implementation for DDE"; - mainProgram = "dde-widgets"; - homepage = "https://github.com/linuxdeepin/dde-widgets"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/deepin-kwin/0001-hardcode-fallback-background.diff b/pkgs/desktops/deepin/core/deepin-kwin/0001-hardcode-fallback-background.diff deleted file mode 100644 index 872fa26c5e55..000000000000 --- a/pkgs/desktops/deepin/core/deepin-kwin/0001-hardcode-fallback-background.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/effects/multitaskview/multitaskview.cpp b/src/effects/multitaskview/multitaskview.cpp -index 268bc42..d41f7bf 100644 ---- a/src/effects/multitaskview/multitaskview.cpp -+++ b/src/effects/multitaskview/multitaskview.cpp -@@ -50,8 +50,8 @@ - #define SCISSOR_HOFFD 400 - - const char screen_recorder[] = "deepin-screen-recorder deepin-screen-recorder"; --const char fallback_background_name[] = "file:///usr/share/wallpapers/deepin/desktop.jpg"; --const char previous_default_background_name[] = "file:///usr/share/backgrounds/default_background.jpg"; -+const char fallback_background_name[] = "file:///run/current-system/sw/share/wallpapers/deepin/desktop.jpg"; -+const char previous_default_background_name[] = "file:///run/current-system/sw/share/backgrounds/default_background.jpg"; - const char add_workspace_png[] = ":/effects/multitaskview/buttons/add-light.png";//":/resources/themes/add-light.svg"; - const char delete_workspace_png[] = ":/effects/multitaskview/buttons/workspace_delete.png"; - diff --git a/pkgs/desktops/deepin/core/deepin-kwin/default.nix b/pkgs/desktops/deepin/core/deepin-kwin/default.nix deleted file mode 100644 index 8cf6180f3652..000000000000 --- a/pkgs/desktops/deepin/core/deepin-kwin/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - wayland, - dwayland, - libsForQt5, - extra-cmake-modules, - gsettings-qt, - libepoxy, - libinput, - libgbm, - lcms2, - xorg, -}: - -stdenv.mkDerivation rec { - pname = "deepin-kwin"; - version = "5.25.27"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-EjPPjdxa+iL/nXhuccoM3NiLmGXh7Un2aGz8O3sP6xE="; - }; - - patches = [ ./0001-hardcode-fallback-background.diff ]; - - # Avoid using absolute path to distinguish applications - postPatch = '' - substituteInPlace src/effects/screenshot/screenshotdbusinterface1.cpp \ - --replace 'file.readAll().startsWith(DEFINE_DDE_DOCK_PATH"dde-dock")' 'file.readAll().contains("dde-dock")' - ''; - - nativeBuildInputs = [ - cmake - pkg-config - extra-cmake-modules - libsForQt5.wrapQtAppsHook - libsForQt5.qttools - ]; - - buildInputs = [ - wayland - dwayland - libepoxy - gsettings-qt - - libinput - libgbm - lcms2 - - xorg.libxcb - xorg.libXdmcp - xorg.libXcursor - xorg.xcbutilcursor - xorg.libXtst - xorg.libXScrnSaver - ] - ++ (with libsForQt5; [ - qtbase - qtx11extras - kconfig - kconfigwidgets - kcoreaddons - kcrash - kdbusaddons - kiconthemes - kglobalaccel - kidletime - knotifications - kpackage - plasma-framework - kcmutils - knewstuff - kdecoration - kscreenlocker - breeze-qt5 - ]); - - cmakeFlags = [ "-DKWIN_BUILD_RUNNERS=OFF" ]; - - outputs = [ - "out" - "dev" - ]; - - meta = { - description = "Fork of kwin, an easy to use, but flexible, composited Window Manager"; - homepage = "https://github.com/linuxdeepin/deepin-kwin"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/deepin-service-manager/default.nix b/pkgs/desktops/deepin/core/deepin-service-manager/default.nix deleted file mode 100644 index 5e06cc3c6a70..000000000000 --- a/pkgs/desktops/deepin/core/deepin-service-manager/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, -}: - -stdenv.mkDerivation rec { - pname = "deepin-service-manager"; - version = "1.0.3"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-gTzyQHFPyn2+A+o+4VYySDBCZftfG2WnTXuqzeF+QhA="; - }; - - postPatch = '' - for file in $(grep -rl "/usr/bin/deepin-service-manager"); do - substituteInPlace $file --replace "/usr/bin/deepin-service-manager" "$out/bin/deepin-service-manager" - done - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - meta = with lib; { - description = "Manage DBus service on Deepin"; - mainProgram = "deepin-service-manager"; - homepage = "https://github.com/linuxdeepin/deepin-service-manager"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix deleted file mode 100644 index 69a503b887ed..000000000000 --- a/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - dtkwidget, - dde-polkit-agent, - qt5integration, - libsecret, -}: - -stdenv.mkDerivation rec { - pname = "dpa-ext-gnomekeyring"; - version = "6.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-SyoahSdGPkWitDek4RD5M2hTR78GFpuijryteKVAx6k="; - }; - - postPatch = '' - substituteInPlace gnomekeyringextention.cpp \ - --replace "/usr/share/dpa-ext-gnomekeyring" "$out/share/dpa-ext-gnomekeyring" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - dtkwidget - dde-polkit-agent - qt5integration - libsecret - ]; - - meta = with lib; { - description = "GNOME keyring extension for dde-polkit-agent"; - homepage = "https://github.com/linuxdeepin/dpa-ext-gnomekeyring"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix deleted file mode 100644 index a7e01c215d11..000000000000 --- a/pkgs/desktops/deepin/default.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ - lib, - config, - pkgs, -}: -let - packages = - self: - let - inherit (self) callPackage; - in - { - #### LIBRARIES - dtkcommon = callPackage ./library/dtkcommon { }; - dtkcore = callPackage ./library/dtkcore { }; - dtkgui = callPackage ./library/dtkgui { }; - dtkwidget = callPackage ./library/dtkwidget { }; - dtkdeclarative = callPackage ./library/dtkdeclarative { }; - dtklog = callPackage ./library/dtklog { }; - deepin-pdfium = callPackage ./library/deepin-pdfium { }; - qt5platform-plugins = callPackage ./library/qt5platform-plugins { }; - qt5integration = callPackage ./library/qt5integration { }; - deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { }; - 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 { }; - udisks2-qt5 = callPackage ./library/udisks2-qt5 { }; - util-dfm = callPackage ./library/util-dfm { }; - dtk6core = callPackage ./library/dtk6core { }; - dtk6gui = callPackage ./library/dtk6gui { }; - dtk6widget = callPackage ./library/dtk6widget { }; - dtk6declarative = callPackage ./library/dtk6declarative { }; - dtk6systemsettings = callPackage ./library/dtk6systemsettings { }; - dtk6log = callPackage ./library/dtk6log { }; - qt6platform-plugins = callPackage ./library/qt6platform-plugins { }; - qt6integration = callPackage ./library/qt6integration { }; - qt6mpris = callPackage ./library/qt6mpris { }; - treeland-protocols = callPackage ./library/treeland-protocols { }; - - #### CORE - deepin-kwin = callPackage ./core/deepin-kwin { }; - dde-appearance = callPackage ./core/dde-appearance { }; - dde-app-services = callPackage ./core/dde-app-services { }; - dde-application-manager = callPackage ./core/dde-application-manager { }; - dde-control-center = callPackage ./core/dde-control-center { }; - dde-calendar = callPackage ./core/dde-calendar { }; - dde-clipboard = callPackage ./core/dde-clipboard { }; - dde-file-manager = callPackage ./core/dde-file-manager { }; - dde-launchpad = callPackage ./core/dde-launchpad { }; - dde-network-core = callPackage ./core/dde-network-core { }; - dde-session = callPackage ./core/dde-session { }; - dde-session-shell = callPackage ./core/dde-session-shell { }; - dde-session-ui = callPackage ./core/dde-session-ui { }; - deepin-service-manager = callPackage ./core/deepin-service-manager { }; - dde-polkit-agent = callPackage ./core/dde-polkit-agent { }; - dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { }; - dde-gsettings-schemas = callPackage ./core/dde-gsettings-schemas { }; - dde-widgets = callPackage ./core/dde-widgets { }; - dde-shell = callPackage ./core/dde-shell { }; - dde-grand-search = callPackage ./core/dde-grand-search { }; - dde-tray-loader = callPackage ./core/dde-tray-loader { }; - dde-api-proxy = callPackage ./core/dde-api-proxy { }; - - #### Dtk Application - deepin-calculator = callPackage ./apps/deepin-calculator { }; - deepin-compressor = callPackage ./apps/deepin-compressor { }; - deepin-draw = callPackage ./apps/deepin-draw { }; - deepin-editor = callPackage ./apps/deepin-editor { }; - deepin-music = callPackage ./apps/deepin-music { }; - deepin-picker = callPackage ./apps/deepin-picker { }; - 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-screensaver = callPackage ./apps/deepin-screensaver { }; - - #### Go Packages - dde-api = callPackage ./go-package/dde-api { }; - dde-daemon = callPackage ./go-package/dde-daemon { }; - deepin-pw-check = callPackage ./go-package/deepin-pw-check { }; - deepin-desktop-schemas = callPackage ./go-package/deepin-desktop-schemas { }; - startdde = callPackage ./go-package/startdde { }; - - #### TOOLS - dde-device-formatter = callPackage ./tools/dde-device-formatter { }; - deepin-gettext-tools = callPackage ./tools/deepin-gettext-tools { }; - deepin-anything = callPackage ./tools/deepin-anything { }; - - #### ARTWORK - dde-account-faces = callPackage ./artwork/dde-account-faces { }; - deepin-icon-theme = callPackage ./artwork/deepin-icon-theme { }; - deepin-wallpapers = callPackage ./artwork/deepin-wallpapers { }; - deepin-gtk-theme = callPackage ./artwork/deepin-gtk-theme { }; - deepin-sound-theme = callPackage ./artwork/deepin-sound-theme { }; - deepin-desktop-theme = callPackage ./artwork/deepin-desktop-theme { }; - - #### MISC - deepin-desktop-base = callPackage ./misc/deepin-desktop-base { }; - } - // lib.optionalAttrs config.allowAliases { - dde-kwin = throw "The 'deepin.dde-kwin' package was removed as it is outdated and no longer relevant."; # added 2023-09-27 - dde-launcher = throw "The 'deepin.dde-launcher' is no longer maintained. Please use 'deepin.dde-launchpad' instead."; # added 2023-11-23 - dde-dock = throw "The 'deepin.dde-dock' is no longer maintained. Please use 'deepin.dde-tray-loader' instead."; # added 2024-08-28 - deepin-clone = throw "The 'deepin.deepin-clone' package was removed as it is broken and unmaintained."; # added 2024-08-23 - deepin-turbo = throw "The 'deepin.deepin-turbo' package was removed as it is outdated and no longer relevant."; # added 2024-12-06 - 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/go-package/dde-api/default.nix b/pkgs/desktops/deepin/go-package/dde-api/default.nix deleted file mode 100644 index e93b47bc9c1c..000000000000 --- a/pkgs/desktops/deepin/go-package/dde-api/default.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ - lib, - fetchFromGitHub, - buildGoModule, - pkg-config, - deepin-gettext-tools, - wrapGAppsHook3, - alsa-lib, - gtk3, - libcanberra, - libgudev, - librsvg, - poppler, - pulseaudio, - gdk-pixbuf-xlib, - coreutils, - dbus, -}: - -buildGoModule rec { - pname = "dde-api"; - version = "6.0.11"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-VpZwVNXxdi8ODwxbksQpT0nnUuLOTJ9h0JYucEKdGYM="; - }; - - vendorHash = "sha256-zrtUsCF2+301DKwgWectw+UbOehOp8h8u/IMf09XQ8Q="; - - postPatch = '' - substituteInPlace misc/systemd/system/deepin-shutdown-sound.service \ - --replace-fail "/usr/bin/true" "${coreutils}/bin/true" - - substituteInPlace sound-theme-player/main.go \ - --replace-fail "/usr/sbin/alsactl" "alsactl" - - substituteInPlace misc/{scripts/deepin-boot-sound.sh,systemd/system/deepin-login-sound.service} \ - --replace-fail "/usr/bin/dbus-send" "${dbus}/bin/dbus-send" - - substituteInPlace lunar-calendar/huangli.go adjust-grub-theme/main.go \ - --replace-fail "/usr/share/dde-api" "$out/share/dde-api" - - substituteInPlace themes/{theme.go,settings.go} \ - --replace-fail "/usr/share" "/run/current-system/sw/share" - - for file in $(grep "/usr/lib/deepin-api" * -nR |awk -F: '{print $1}') - do - sed -i 's|/usr/lib/deepin-api|/run/current-system/sw/lib/deepin-api|g' $file - done - ''; - - nativeBuildInputs = [ - pkg-config - deepin-gettext-tools - wrapGAppsHook3 - ]; - - buildInputs = [ - alsa-lib - gtk3 - libcanberra - libgudev - librsvg - poppler - pulseaudio - gdk-pixbuf-xlib - ]; - - buildPhase = '' - runHook preBuild - make GOBUILD_OPTIONS="$GOFLAGS" - runHook postBuild - ''; - - doCheck = false; - - installPhase = '' - runHook preInstall - make install DESTDIR="$out" PREFIX="/" - runHook postInstall - ''; - - postFixup = '' - for binary in $out/lib/deepin-api/*; do - wrapProgram $binary "''${gappsWrapperArgs[@]}" - done - ''; - - meta = with lib; { - description = "Dbus interfaces used for screen zone detecting, thumbnail generating, sound playing, etc"; - mainProgram = "dde-open"; - homepage = "https://github.com/linuxdeepin/dde-api"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/0001-dont-set-PATH.diff b/pkgs/desktops/deepin/go-package/dde-daemon/0001-dont-set-PATH.diff deleted file mode 100644 index f1d9f8017af6..000000000000 --- a/pkgs/desktops/deepin/go-package/dde-daemon/0001-dont-set-PATH.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/grub2/modify_manger.go b/grub2/modify_manger.go -index a811770b..30e9561e 100644 ---- a/grub2/modify_manger.go -+++ b/grub2/modify_manger.go -@@ -21,7 +21,6 @@ const ( - ) - - func init() { -- _ = os.Setenv("PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin") - } - - type modifyManager struct { --- -2.39.2 - diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/0002-fix-custom-wallpapers-path.diff b/pkgs/desktops/deepin/go-package/dde-daemon/0002-fix-custom-wallpapers-path.diff deleted file mode 100644 index 5d4bddd08009..000000000000 --- a/pkgs/desktops/deepin/go-package/dde-daemon/0002-fix-custom-wallpapers-path.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/bin/dde-system-daemon/wallpaper.go b/bin/dde-system-daemon/wallpaper.go -index 6ee26e27..67dc77dc 100644 ---- a/bin/dde-system-daemon/wallpaper.go -+++ b/bin/dde-system-daemon/wallpaper.go -@@ -24,7 +24,7 @@ import ( - - const maxCount = 5 - const maxSize = 32 * 1024 * 1024 --const wallPaperDir = "/usr/share/wallpapers/custom-wallpapers/" -+const wallPaperDir = "/var/lib/dde-daemon/wallpapers/custom-wallpapers/" - - func GetUserDir(username string) (string, error) { - dir := filepath.Join(wallPaperDir, username) -@@ -136,7 +136,7 @@ func (d *Daemon) SaveCustomWallPaper(sender dbus.Sender, username string, file s - "-u", - username, - "--", -- "head", -+ "@coreutils@/bin/head", - "-c", - "0", - file, --- -2.40.1 - diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/0003-aviod-use-hardcode-path.diff b/pkgs/desktops/deepin/go-package/dde-daemon/0003-aviod-use-hardcode-path.diff deleted file mode 100644 index ca508e772556..000000000000 --- a/pkgs/desktops/deepin/go-package/dde-daemon/0003-aviod-use-hardcode-path.diff +++ /dev/null @@ -1,92 +0,0 @@ -diff --git a/accounts1/user.go b/accounts1/user.go -index 8101d9c6..16c7f15f 100644 ---- a/accounts1/user.go -+++ b/accounts1/user.go -@@ -482,7 +482,7 @@ func (u *User) checkIsControlCenter(sender dbus.Sender) bool { - return false - } - -- if exe == controlCenterPath { -+ if strings.Contains(exe, "dde-control-center") { - return true - } - -diff --git a/accounts1/user_chpwd_union_id.go b/accounts1/user_chpwd_union_id.go -index 61a691d9..47d2163e 100644 ---- a/accounts1/user_chpwd_union_id.go -+++ b/accounts1/user_chpwd_union_id.go -@@ -89,14 +89,13 @@ func newCaller(service *dbusutil.Service, sender dbus.Sender) (ret *caller, err - - // 只允许来自控制中心, 锁屏和 greetter 的调用 - var app string -- switch exe { -- case "/usr/bin/dde-control-center": -+ if (strings.Contains(exe, "dde-control-center")) { - app = "control-center" -- case "/usr/bin/dde-lock": -+ } else if (strings.Contains(exe, "dde-lock")) { - app = "lock" -- case "/usr/bin/lightdm-deepin-greeter": -+ } else if (strings.Contains(exe, "lightdm-deepin-greeter")) { - app = "greeter" -- default: -+ } else { - err = fmt.Errorf("set password with Union ID called by %s, which is not allow", exe) - return - } -diff --git a/bin/dde-authority/fprint_transaction.go b/bin/dde-authority/fprint_transaction.go -index ca2951a0..3223ad25 100644 ---- a/bin/dde-authority/fprint_transaction.go -+++ b/bin/dde-authority/fprint_transaction.go -@@ -461,7 +461,7 @@ func (tx *FPrintTransaction) End(sender dbus.Sender) *dbus.Error { - - func killFPrintDaemon() { - logger.Debug("kill fprintd") -- err := exec.Command("pkill", "-f", "/usr/lib/fprintd/fprintd").Run() -+ err := exec.Command("pkill", "fprintd").Run() - if err != nil { - logger.Warning("failed to kill fprintd:", err) - } -diff --git a/grub2/grub2.go b/grub2/grub2.go -index 085b7157..10cb8256 100644 ---- a/grub2/grub2.go -+++ b/grub2/grub2.go -@@ -603,7 +603,7 @@ func checkInvokePermission(service *dbusutil.Service, sender dbus.Sender) error - if err != nil { - return err - } -- if cmd == "/usr/bin/dde-control-center" { -+ if strings.Contains(cmd, "dde-control-center") { - return nil - } - uid, err := service.GetConnUID(string(sender)) -diff --git a/misc/etc/acpi/powerbtn.sh b/misc/etc/acpi/powerbtn.sh -index 5c536b9e..39c28987 100755 ---- a/misc/etc/acpi/powerbtn.sh -+++ b/misc/etc/acpi/powerbtn.sh -@@ -58,4 +58,4 @@ elif test "$XUSER" != "" && test -x /usr/bin/qdbus; then - fi - - # If all else failed, just initiate a plain shutdown. --/sbin/shutdown -h now "Power button pressed" -+shutdown -h now "Power button pressed" -diff --git a/misc/udev-rules/80-deepin-fprintd.rules b/misc/udev-rules/80-deepin-fprintd.rules -index 7063a40c..c4c6103a 100644 ---- a/misc/udev-rules/80-deepin-fprintd.rules -+++ b/misc/udev-rules/80-deepin-fprintd.rules -@@ -1 +1 @@ --SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_interface", ACTION=="add|remove", ENV{LIBFPRINT_DRIVER}!="", RUN+="/usr/bin/dbus-send --system --dest=org.deepin.dde.Fprintd1 --print-reply /org/deepin/dde/Fprintd1 org.deepin.dde.Fprintd1.TriggerUDevEvent" -+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_interface", ACTION=="add|remove", ENV{LIBFPRINT_DRIVER}!="", RUN+="@dbus@/bin/dbus-send --system --dest=org.deepin.dde.Fprintd1 --print-reply /org/deepin/dde/Fprintd1 org.deepin.dde.Fprintd1.TriggerUDevEvent" -diff --git a/system/display/displaycfg.go b/system/display/displaycfg.go -index cda69a77..e394ae07 100644 ---- a/system/display/displaycfg.go -+++ b/system/display/displaycfg.go -@@ -255,7 +255,7 @@ func (d *Display) doDetectSupportWayland(sender dbus.Sender) (bool, error) { - return false, err - } - var cmd *exec.Cmd -- if execPath == "/usr/bin/lightdm-deepin-greeter" { -+ if strings.Contains(execPath, "lightdm-deepin-greeter") { - cmd = exec.Command("runuser", "-u", "lightdm", "glxinfo") // runuser -u lightdm glxinfo - } else { - cmd = exec.Command("glxinfo") diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix deleted file mode 100644 index 56c6b7a8eade..000000000000 --- a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix +++ /dev/null @@ -1,165 +0,0 @@ -{ - lib, - fetchFromGitHub, - replaceVars, - buildGoModule, - pkg-config, - deepin-gettext-tools, - gettext, - python3, - wrapGAppsHook3, - ddcutil, - alsa-lib, - glib, - gtk3, - libgudev, - libinput, - libnl, - librsvg, - linux-pam, - libxcrypt, - networkmanager, - pulseaudio, - gdk-pixbuf-xlib, - tzdata, - xkeyboard_config, - runtimeShell, - dbus, - util-linux, - dde-session-ui, - coreutils, - lshw, - dmidecode, - systemd, - udevCheckHook, -}: - -buildGoModule rec { - pname = "dde-daemon"; - version = "6.0.43"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-3BzFFlcNwNWNcysD3qRYfdyGaX7gW2XJZ4HzdGiK7jU="; - }; - - vendorHash = "sha256-3kUAaVXERqNZhBFytzVbWY6/a8M0jIkWrN+QHdWp1HU="; - - patches = [ - ./0001-dont-set-PATH.diff - (replaceVars ./0002-fix-custom-wallpapers-path.diff { - inherit coreutils; - }) - (replaceVars ./0003-aviod-use-hardcode-path.diff { - inherit dbus; - }) - ]; - - postPatch = '' - substituteInPlace session/eventlog/{app_event.go,login_event.go} \ - --replace-fail "/bin/bash" "${runtimeShell}" - - substituteInPlace inputdevices/layout_list.go \ - --replace-fail "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb" - - substituteInPlace accounts1/user.go \ - --replace-fail "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers" - - substituteInPlace timedate1/zoneinfo/zone.go \ - --replace-fail "/usr/share/dde" "$out/share/dde" \ - --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" - - substituteInPlace accounts1/image_blur.go grub2/modify_manger.go \ - --replace-fail "/usr/lib/deepin-api" "/run/current-system/sw/lib/deepin-api" - - substituteInPlace accounts1/user_chpwd_union_id.go \ - --replace-fail "/usr/lib/dde-control-center" "/run/current-system/sw/lib/dde-control-center" - - substituteInPlace system/uadp1/crypto.go \ - --replace-fail "/usr/share/uadp" "/var/lib/dde-daemon/uadp" - - for file in $(grep "/usr/lib/deepin-daemon" * -nR |awk -F: '{print $1}') - do - sed -i 's|/usr/lib/deepin-daemon|/run/current-system/sw/lib/deepin-daemon|g' $file - done - - patchShebangs . - ''; - - nativeBuildInputs = [ - pkg-config - deepin-gettext-tools - gettext - python3 - wrapGAppsHook3 - udevCheckHook - ]; - - buildInputs = [ - ddcutil - linux-pam - libxcrypt - alsa-lib - glib - libgudev - gtk3 - gdk-pixbuf-xlib - networkmanager - libinput - libnl - librsvg - pulseaudio - tzdata - xkeyboard_config - ]; - - buildPhase = '' - runHook preBuild - make GOBUILD_OPTIONS="$GOFLAGS" - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - make install DESTDIR="$out" PREFIX="/" - runHook postInstall - ''; - - doCheck = false; - - doInstallCheck = true; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH : "${ - lib.makeBinPath [ - util-linux - dde-session-ui - glib - lshw - dmidecode - systemd - ] - }" - ) - ''; - - postFixup = '' - for binary in $out/lib/deepin-daemon/*; do - if [ "$binary" == "$out/lib/deepin-daemon/service-trigger" ] ; then - continue; - fi - wrapGApp $binary - done - ''; - - meta = with lib; { - description = "Daemon for handling the deepin session settings"; - homepage = "https://github.com/linuxdeepin/dde-daemon"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix deleted file mode 100644 index 8cbfc4d47e01..000000000000 --- a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - stdenv, - lib, - buildGoModule, - fetchFromGitHub, - glib, -}: - -buildGoModule rec { - pname = "deepin-desktop-schemas"; - version = "6.0.7"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-Zp80Yz0qkFAwpQJPgs/gcfCG2DMtvpKdVKRlqOTmaCk="; - }; - - vendorHash = "sha256-q6ugetchJLv2JjZ9+nevUI0ptizh2V+6SByoY/eFJJQ="; - - postPatch = '' - # Relocate files path for backgrounds and wallpapers - for file in $(grep -rl "/usr/share") - do - substituteInPlace $file \ - --replace-fail "/usr/share" "/run/current-system/sw/share" - done - ''; - - buildPhase = '' - runHook preBuild - make ARCH=${stdenv.hostPlatform.linuxArch} - runHook postBuild - ''; - - nativeCheckInputs = [ glib ]; - checkPhase = '' - runHook preCheck - make test - runHook postCheck - ''; - - installPhase = '' - runHook preInstall - make install DESTDIR="$out" PREFIX="/" - runHook postInstall - ''; - - meta = { - description = "GSettings deepin desktop-wide schemas"; - homepage = "https://github.com/linuxdeepin/deepin-desktop-schemas"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix deleted file mode 100644 index 3ca39dba0d55..000000000000 --- a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - lib, - fetchFromGitHub, - buildGoModule, - pkg-config, - deepin-gettext-tools, - gtk3, - glib, - libxcrypt, - gettext, - iniparser, - cracklib, - linux-pam, -}: - -buildGoModule rec { - pname = "deepin-pw-check"; - version = "6.0.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-kBrkcB0IWGUV4ZrkFzwdPglRgDcnVvYDFhTXS20pKOk="; - }; - - patches = [ "${src}/rpm/0001-Mangle-Suit-Cracklib2.9.6.patch" ]; - - vendorHash = "sha256-L0vUEkUN70Hrx5roIvTfaZBHbbq7mf3WpQJeFAMU5HY="; - - nativeBuildInputs = [ - pkg-config - gettext - deepin-gettext-tools - ]; - - buildInputs = [ - glib - libxcrypt - gtk3 - iniparser - cracklib - linux-pam - ]; - - postPatch = '' - sed -i '1i#include \n#include ' tool/pwd_conf_update.c - substituteInPlace misc/{pkgconfig/libdeepin_pw_check.pc,system-services/org.deepin.dde.PasswdConf1.service} \ - --replace-fail "/usr" "$out" - ''; - - buildPhase = '' - runHook preBuild - make - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - make install PREFIX="$out" PKG_FILE_DIR=$out/lib/pkgconfig PAM_MODULE_DIR=$out/etc/pam.d - # https://github.com/linuxdeepin/deepin-pw-check/blob/d5597482678a489077a506a87f06d2b6c4e7e4ed/debian/rules#L21 - ln -s $out/lib/libdeepin_pw_check.so $out/lib/libdeepin_pw_check.so.1 - runHook postInstall - ''; - - meta = with lib; { - description = "Tool to verify the validity of the password"; - mainProgram = "pwd-conf-update"; - homepage = "https://github.com/linuxdeepin/deepin-pw-check"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/go-package/startdde/default.nix b/pkgs/desktops/deepin/go-package/startdde/default.nix deleted file mode 100644 index a85b50b4a3ce..000000000000 --- a/pkgs/desktops/deepin/go-package/startdde/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - gettext, - pkg-config, - jq, - wrapGAppsHook3, - glib, - libgnome-keyring, - gtk3, - alsa-lib, - pulseaudio, - libgudev, - libsecret, - runtimeShell, - dbus, -}: - -buildGoModule rec { - pname = "startdde"; - version = "6.0.15"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-RSfdlLT2v3fM4P8E0mIyZZ8A1MWVIS0N0MDczqq7Y64="; - }; - - vendorHash = "sha256-Y81p3yPQayXbvyUI7N6PvFDO3hSU3SL0AuUKxvZkZNE="; - - postPatch = '' - substituteInPlace display/manager.go \ - --replace "/bin/bash" "${runtimeShell}" - - substituteInPlace misc/systemd_task/dde-display-task-refresh-brightness.service \ - --replace "/usr/bin/dbus-send" "${dbus}/bin/dbus-send" - - substituteInPlace display/manager.go \ - --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" - - substituteInPlace misc/lightdm.conf --replace "/usr" "$out" - ''; - - nativeBuildInputs = [ - gettext - pkg-config - jq - wrapGAppsHook3 - glib - ]; - - buildInputs = [ - libgnome-keyring - gtk3 - alsa-lib - pulseaudio - libgudev - libsecret - ]; - - buildPhase = '' - runHook preBuild - make GO_BUILD_FLAGS="$GOFLAGS" - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - make install DESTDIR="$out" PREFIX="/" - runHook postInstall - ''; - - meta = with lib; { - description = "Starter of deepin desktop environment"; - homepage = "https://github.com/linuxdeepin/startdde"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix deleted file mode 100644 index 1c3ba4fdea41..000000000000 --- a/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - libsForQt5, - python3, - dtkcore, -}: - -stdenv.mkDerivation rec { - pname = "dde-qt-dbus-factory"; - version = "6.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-B9SrApvjTIW2g9VayrmCsWXS9Gkg55Voi1kPP+KYp3s="; - }; - - nativeBuildInputs = [ - libsForQt5.qmake - libsForQt5.wrapQtAppsHook - python3 - ]; - - buildInputs = [ - libsForQt5.qtbase - dtkcore - ]; - - qmakeFlags = [ - "INSTALL_ROOT=${placeholder "out"}" - "LIB_INSTALL_DIR=${placeholder "out"}/lib" - ]; - - postPatch = '' - substituteInPlace libdframeworkdbus/libdframeworkdbus.pro \ - --replace-fail "/usr" "" - substituteInPlace libdframeworkdbus/DFrameworkdbusConfig.in \ - --replace-fail "/usr/include" "$out/include" - ''; - - meta = { - description = "Repo of auto-generated D-Bus source code which DDE used"; - homepage = "https://github.com/linuxdeepin/dde-qt-dbus-factory"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/deepin-pdfium/default.nix b/pkgs/desktops/deepin/library/deepin-pdfium/default.nix deleted file mode 100644 index c7342c3f6f43..000000000000 --- a/pkgs/desktops/deepin/library/deepin-pdfium/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - freetype, - icu, - libsForQt5, - pkg-config, - libchardet, - libjpeg, - lcms2, - openjpeg, -}: - -stdenv.mkDerivation rec { - pname = "deepin-pdfium"; - version = "1.0.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-ymJSTAccwRumXrh4VjwarKYgaqadMBrtXM1rjWNfe8o="; - }; - - nativeBuildInputs = [ - libsForQt5.qmake - pkg-config - ]; - - dontWrapQtApps = true; - - buildInputs = [ - freetype - icu - libchardet - libjpeg - lcms2 - openjpeg - ]; - - meta = with lib; { - description = "Development library for PDF on deepin"; - homepage = "https://github.com/linuxdeepin/deepin-pdfium"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix b/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix deleted file mode 100644 index c13f02c2c68c..000000000000 --- a/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - extra-cmake-modules, -}: - -stdenv.mkDerivation rec { - pname = "deepin-wayland-protocols"; - version = "1.6.0-deepin.1.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-8Im3CueC8sYA5mwRU/Z7z8HA4mPQvVSqcTD813QCYxo="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - meta = with lib; { - description = "XML files of the non-standard wayland protocols use in deepin"; - homepage = "https://github.com/linuxdeepin/deepin-wayland-protocols"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/disomaster/default.nix b/pkgs/desktops/deepin/library/disomaster/default.nix deleted file mode 100644 index ad462fc6c755..000000000000 --- a/pkgs/desktops/deepin/library/disomaster/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - libsForQt5, - libisoburn, -}: - -stdenv.mkDerivation rec { - pname = "disomaster"; - version = "5.0.8"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-wN8mhddqqzYXkT6rRWsHVCWzaG2uRcF2iiFHlZx2LfY="; - }; - - nativeBuildInputs = [ - libsForQt5.qmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ libisoburn ]; - - qmakeFlags = [ "VERSION=${version}" ]; - - meta = with lib; { - description = "Libisoburn wrapper class for Qt"; - homepage = "https://github.com/linuxdeepin/disomaster"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/docparser/default.nix b/pkgs/desktops/deepin/library/docparser/default.nix deleted file mode 100644 index f9fff425ac10..000000000000 --- a/pkgs/desktops/deepin/library/docparser/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - libsForQt5, - poppler, - pugixml, - libzip, - libuuid, - libxml2, - tinyxml-2, -}: - -stdenv.mkDerivation rec { - pname = "docparser"; - version = "1.0.11"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-shZXhs9ncgm6rECvCWrLi26RO1WAc1gRowoYmeKesfk="; - }; - - nativeBuildInputs = [ - libsForQt5.qmake - libsForQt5.qttools - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - poppler - pugixml - libzip - libuuid - libxml2 - tinyxml-2 - ]; - - qmakeFlags = [ "VERSION=${version}" ]; - - meta = { - description = "Document parser library ported from document2html"; - homepage = "https://github.com/linuxdeepin/docparser"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/dtk6core/default.nix b/pkgs/desktops/deepin/library/dtk6core/default.nix deleted file mode 100644 index ff753a81ecf2..000000000000 --- a/pkgs/desktops/deepin/library/dtk6core/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - cmake, - pkg-config, - doxygen, - qt6Packages, - lshw, - libuchardet, - dtkcommon, - dtk6log, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dtk6core"; - version = "6.0.33"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "dtk6core"; - rev = finalAttrs.version; - hash = "sha256-AmGQoDt9qp0m0iV7WrR16DPTt80Y5leRUVXPOtHeugs="; - }; - - patches = [ - ./fix-pkgconfig-path.patch - ./fix-pri-path.patch - (fetchpatch { - name = "resolve-compilation-issues-on-Qt-6_9.patch"; - url = "https://github.com/linuxdeepin/dtkcore/commit/8f523a8b387a006b942268e2143d0d58c574f7c5.patch"; - hash = "sha256-x8BfWCdsz8Bf/sAM7PymZWqlPyEabwP0e6ybfz/2oZ4="; - }) - ]; - - postPatch = '' - substituteInPlace misc/DtkCoreConfig.cmake.in \ - --subst-var-by PACKAGE_TOOL_INSTALL_DIR ${placeholder "out"}/libexec/dtk6/DCore/bin - ''; - - nativeBuildInputs = [ - cmake - pkg-config - doxygen - qt6Packages.qttools - qt6Packages.wrapQtAppsHook - ]; - - dontWrapQtApps = true; - - buildInputs = [ - qt6Packages.qtbase - lshw - libuchardet - ]; - - propagatedBuildInputs = [ - dtkcommon - dtk6log - ]; - - cmakeFlags = [ - "-DDTK_VERSION=${finalAttrs.version}" - "-DBUILD_DOCS=ON" - "-DBUILD_EXAMPLES=OFF" - "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc" - "-DDSG_PREFIX_PATH='/run/current-system/sw'" - "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" - "-DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} - ''; - - outputs = [ - "out" - "dev" - "doc" - ]; - - postFixup = '' - for binary in $out/libexec/dtk6/DCore/bin/*; do - wrapQtApp $binary - done - ''; - - meta = { - description = "Deepin tool kit core library"; - homepage = "https://github.com/linuxdeepin/dtk6core"; - license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -}) diff --git a/pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch deleted file mode 100644 index 570e34c06147..000000000000 --- a/pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/misc/dtkcore.pc.in b/misc/dtkcore.pc.in -index 83eecb7..da24ce8 100644 ---- a/misc/dtkcore.pc.in -+++ b/misc/dtkcore.pc.in -@@ -1,7 +1,7 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${prefix}/@LIBRARY_INSTALL_DIR@ --includedir=${prefix}/@INCLUDE_INSTALL_DIR@ -+libdir=@LIBRARY_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@ - - Name: dtk@DTK_VERSION_MAJOR@core - Description: Deepin Tool Kit dtkcore header files diff --git a/pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch deleted file mode 100644 index 19953ed1733d..000000000000 --- a/pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/misc/qt_lib_dtkcore.pri.in b/misc/qt_lib_dtkcore.pri.in -index a331f52..ce01dc0 100644 ---- a/misc/qt_lib_dtkcore.pri.in -+++ b/misc/qt_lib_dtkcore.pri.in -@@ -4,9 +4,9 @@ QT.dtkcore.MINOR_VERSION = @PROJECT_VERSION_MINOR@ - QT.dtkcore.PATCH_VERSION = @PROJECT_VERSION_PATCH@ - QT.dtkcore.name = dtkcore - QT.dtkcore.module = dtk@DTK_VERSION_MAJOR@core --QT.dtkcore.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@ --QT.dtkcore.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@ --QT.dtkcore.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ -+QT.dtkcore.tools = @TOOL_INSTALL_DIR@ -+QT.dtkcore.libs = @LIBRARY_INSTALL_DIR@ -+QT.dtkcore.includes = @INCLUDE_INSTALL_DIR@ - QT.dtkcore.frameworks = - QT.dtkcore.depends = core dbus xml - QT.dtkcore.module_config = v2 ltcg diff --git a/pkgs/desktops/deepin/library/dtk6declarative/default.nix b/pkgs/desktops/deepin/library/dtk6declarative/default.nix deleted file mode 100644 index 57c58dceccb4..000000000000 --- a/pkgs/desktops/deepin/library/dtk6declarative/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - doxygen, - qt6Packages, - dtk6gui, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dtk6declarative"; - version = "6.0.33"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "dtk6declarative"; - rev = finalAttrs.version; - hash = "sha256-hFH5XCeNs31hslaPMyuXBLe0Du3s6STs9kltwL+/F1s="; - }; - - patches = [ - ./fix-pkgconfig-path.patch - ./fix-pri-path.patch - ]; - - nativeBuildInputs = [ - cmake - pkg-config - doxygen - qt6Packages.qttools - qt6Packages.wrapQtAppsHook - ]; - - propagatedBuildInputs = [ - dtk6gui - ] - ++ (with qt6Packages; [ - qtbase - qtdeclarative - qtshadertools - qt5compat - ]); - - cmakeFlags = [ - "-DDTK_VERSION=${finalAttrs.version}" - "-DBUILD_DOCS=ON" - "-DBUILD_EXAMPLES=ON" - "-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules" - "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc" - "-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} - export QML2_IMPORT_PATH=${lib.getBin qt6Packages.qtdeclarative}/${qt6Packages.qtbase.qtQmlPrefix} - ''; - - outputs = [ - "out" - "dev" - "doc" - ]; - - meta = { - description = "Widget development toolkit based on QtQuick/QtQml"; - mainProgram = "dtk-exhibition"; - homepage = "https://github.com/linuxdeepin/dtk6declarative"; - license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -}) diff --git a/pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch deleted file mode 100644 index e15ee2f7a0b8..000000000000 --- a/pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/misc/dtkdeclarative.pc.in b/misc/dtkdeclarative.pc.in -index dc3827f..fd0949e 100644 ---- a/misc/dtkdeclarative.pc.in -+++ b/misc/dtkdeclarative.pc.in -@@ -1,7 +1,7 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${prefix}/@LIB_INSTALL_DIR@ --includedir=${prefix}/@INCLUDE_INSTALL_DIR@ -+libdir=@LIB_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@ - - Name: DtkDeclarative - Description: Deepin Tool Kit DtkDeclarative header files diff --git a/pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch deleted file mode 100644 index e622809c3936..000000000000 --- a/pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/misc/qt_lib_dtkdeclarative.pri.in b/misc/qt_lib_dtkdeclarative.pri.in -index 8797802..44e32a3 100644 ---- a/misc/qt_lib_dtkdeclarative.pri.in -+++ b/misc/qt_lib_dtkdeclarative.pri.in -@@ -4,8 +4,8 @@ QT.dtkdeclarative.MINOR_VERSION = @PROJECT_VERSION_MINOR@ - QT.dtkdeclarative.PATCH_VERSION = @PROJECT_VERSION_PATCH@ - QT.dtkdeclarative.name = dtkdeclarative - QT.dtkdeclarative.module = dtk@DTK_VERSION_MAJOR@declarative --QT.dtkdeclarative.libs = @CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@ --QT.dtkdeclarative.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ -+QT.dtkdeclarative.libs = @LIB_INSTALL_DIR@ -+QT.dtkdeclarative.includes = @INCLUDE_INSTALL_DIR@ - QT.dtkdeclarative.frameworks = - QT.dtkdeclarative.depends = core dbus xml gui dtkcore dtkgui quick quick_private - QT.dtkdeclarative.module_config = v2 ltcg diff --git a/pkgs/desktops/deepin/library/dtk6gui/default.nix b/pkgs/desktops/deepin/library/dtk6gui/default.nix deleted file mode 100644 index e66063f416b5..000000000000 --- a/pkgs/desktops/deepin/library/dtk6gui/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - cmake, - pkg-config, - doxygen, - qt6Packages, - dtk6core, - librsvg, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dtk6gui"; - version = "6.0.33"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "dtk6gui"; - rev = finalAttrs.version; - hash = "sha256-ZnRhrlgrQ7Vusod2diFwVEVnNGHYNq5Ij12GbW6LXWc="; - }; - - patches = [ - ./fix-pkgconfig-path.patch - ./fix-pri-path.patch - (fetchpatch { - name = "resolve-compilation-issues-on-Qt-6_9.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6gui/-/raw/ae64c77a73cdea069579ecf6833be63635237180/qt-6.9.patch"; - hash = "sha256-45L3ZQ9Hv7tLdDjtazLhVl8XgKBtcHL3CT2nw6GkqgM="; - }) - ]; - - postPatch = '' - substituteInPlace src/util/dsvgrenderer.cpp \ - --replace-fail 'QLibrary("rsvg-2", "2")' 'QLibrary("${lib.getLib librsvg}/lib/librsvg-2.so")' - sed '1i#include ' \ - -i 'src/kernel/dguiapplicationhelper.cpp' - ''; - - nativeBuildInputs = [ - cmake - pkg-config - doxygen - qt6Packages.qttools - qt6Packages.wrapQtAppsHook - ]; - - buildInputs = [ - qt6Packages.qtbase - qt6Packages.qtwayland - librsvg - ]; - - propagatedBuildInputs = [ - dtk6core - qt6Packages.qtimageformats - ]; - - cmakeFlags = [ - "-DDTK_VERSION=${finalAttrs.version}" - "-DBUILD_DOCS=ON" - "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" - "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} - ''; - - outputs = [ - "out" - "dev" - "doc" - ]; - - postFixup = '' - for binary in $out/libexec/dtk6/DGui/bin/*; do - wrapQtApp $binary - done - ''; - - meta = { - description = "Deepin Toolkit, gui module for DDE look and feel"; - homepage = "https://github.com/linuxdeepin/dtk6gui"; - license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -}) diff --git a/pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch deleted file mode 100644 index 1485baccc204..000000000000 --- a/pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/misc/dtkgui.pc.in b/misc/dtkgui.pc.in -index 89fdbbf..ad817c4 100644 ---- a/misc/dtkgui.pc.in -+++ b/misc/dtkgui.pc.in -@@ -1,8 +1,8 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${prefix}/@LIBRARY_INSTALL_DIR@ --includedir=${prefix}/@INCLUDE_INSTALL_DIR@ --tooldir=${prefix}/@PACKAGE_TOOL_INSTALL_DIR@ -+libdir=@LIBRARY_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@ -+tooldir=@PACKAGE_TOOL_INSTALL_DIR@ - - Name: dtk@DTK_VERSION_MAJOR@gui - Description: Deepin Tool Kit dtkgui header files diff --git a/pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch deleted file mode 100644 index b746d34b1c79..000000000000 --- a/pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/misc/qt_lib_dtkgui.pri.in b/misc/qt_lib_dtkgui.pri.in -index 28308ee..9fb25e6 100644 ---- a/misc/qt_lib_dtkgui.pri.in -+++ b/misc/qt_lib_dtkgui.pri.in -@@ -4,9 +4,9 @@ QT.dtkgui.MINOR_VERSION = @PROJECT_VERSION_MINOR@ - QT.dtkgui.PATCH_VERSION = @PROJECT_VERSION_PATCH@ - QT.dtkgui.name = dtkgui - QT.dtkgui.module = dtk@DTK_VERSION_MAJOR@gui --QT.dtkgui.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@ --QT.dtkgui.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@ --QT.dtkgui.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ -+QT.dtkgui.tools = @TOOL_INSTALL_DIR@ -+QT.dtkgui.libs = @LIBRARY_INSTALL_DIR@ -+QT.dtkgui.includes = @INCLUDE_INSTALL_DIR@ - QT.dtkgui.frameworks = - QT.dtkgui.depends = core gui dtkcore gui_private dbus network - QT.dtkgui.module_config = v2 internal_module ltcg diff --git a/pkgs/desktops/deepin/library/dtk6log/default.nix b/pkgs/desktops/deepin/library/dtk6log/default.nix deleted file mode 100644 index 6e89449f7d0d..000000000000 --- a/pkgs/desktops/deepin/library/dtk6log/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - cmake, - pkg-config, - qt6Packages, - spdlog, - systemd, - withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dtk6log"; - version = "0.0.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "dtk6log"; - rev = finalAttrs.version; - hash = "sha256-uPuka+uVCcl2sBMr1SpgqLpcIqZm6BDZyGd7FOraHVM="; - }; - - patches = [ - (fetchpatch { - name = "resolve-compilation-issues-on-Qt-6_9.patch"; - url = "https://github.com/linuxdeepin/dtklog/commit/ab7ed5aa8433c726470f2aecc1d99f118eae8b63.patch"; - hash = "sha256-QK4MOAzTZjjK5qfmzguXAgHO9guMCRN/5y+llBSY2vk="; - }) - ]; - - nativeBuildInputs = [ - cmake - pkg-config - qt6Packages.wrapQtAppsHook - ]; - - dontWrapQtApps = true; - - buildInputs = [ - qt6Packages.qtbase - spdlog - ] - ++ lib.optional withSystemd systemd; - - cmakeFlags = [ - (lib.cmakeBool "BUILD_WITH_QT6" true) - (lib.cmakeBool "BUILD_WITH_SYSTEMD" withSystemd) - (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") - (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") - ]; - - meta = { - description = "Simple, convinient and thread safe logger for Qt-based C++ apps"; - homepage = "https://github.com/linuxdeepin/dtk6log"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -}) diff --git a/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix b/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix deleted file mode 100644 index 1049dfe422f4..000000000000 --- a/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - doxygen, - qt6Packages, - dtk6core, - libxcrypt, -}: - -stdenv.mkDerivation rec { - pname = "dtk6systemsettings"; - version = "6.0.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-b/iI2OKQQoFj3vWatfGdDP9z+SEsK5XBra9KqjlGzqs="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - doxygen - qt6Packages.qttools - ]; - - dontWrapQtApps = true; - - buildInputs = [ - qt6Packages.qtbase - dtk6core - libxcrypt - ]; - - cmakeFlags = [ - "-DDTK_VERSION=${version}" - "-DBUILD_DOCS=ON" - "-DBUILD_EXAMPLES=OFF" - "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc" - "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" - "-DDTK_INCLUDE_INSTALL_DIR=${placeholder "dev"}/include/dtk/DSystemSettings" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} - ''; - - outputs = [ - "out" - "dev" - "doc" - ]; - - meta = { - description = "Qt-based development library for system settings"; - homepage = "https://github.com/linuxdeepin/dtk6systemsettings"; - license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/dtk6widget/default.nix b/pkgs/desktops/deepin/library/dtk6widget/default.nix deleted file mode 100644 index d44097fe6050..000000000000 --- a/pkgs/desktops/deepin/library/dtk6widget/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - cmake, - pkg-config, - doxygen, - qt6Packages, - dtk6gui, - cups, - libstartup_notification, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dtk6widget"; - version = "6.0.33"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "dtk6widget"; - rev = finalAttrs.version; - hash = "sha256-CSsN/6Geban/l6Rp5NuxIUomgTlqXyvttafTbjZIwSc="; - }; - - patches = [ - ./fix-pkgconfig-path.patch - ./fix-pri-path.patch - (fetchpatch { - name = "resolve-compilation-issues-on-Qt-6_9.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6widget/-/raw/ce8f89bbed6ebd4659c7f964f158857ebfdee01c/qt-6.9.patch"; - hash = "sha256-LlFBXuoPxuszO9bkXK1Cy6zMTSnlh33UnmlKMJk3QH0="; - }) - ]; - - postPatch = '' - substituteInPlace src/widgets/dapplication.cpp \ - --replace-fail "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);" \ - "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation) << \"$out/share\";" - ''; - - nativeBuildInputs = [ - cmake - doxygen - pkg-config - qt6Packages.qttools - qt6Packages.wrapQtAppsHook - ]; - - buildInputs = [ - cups - libstartup_notification - ] - ++ (with qt6Packages; [ - qtbase - qtmultimedia - qtsvg - ]); - - propagatedBuildInputs = [ dtk6gui ]; - - cmakeFlags = [ - "-DDTK_VERSION=${finalAttrs.version}" - "-DBUILD_DOCS=ON" - "-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules" - "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} - ''; - - outputs = [ - "out" - "dev" - "doc" - ]; - - postFixup = '' - for binary in $out/lib/dtk6/DWidget/bin/*; do - wrapQtApp $binary - done - ''; - - meta = { - description = "Deepin graphical user interface library"; - homepage = "https://github.com/linuxdeepin/dtk6widget"; - license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -}) diff --git a/pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch deleted file mode 100644 index df4452259580..000000000000 --- a/pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/misc/DtkWidget.pc.in b/misc/DtkWidget.pc.in -index 3c610669..b6ed04ca 100644 ---- a/misc/DtkWidget.pc.in -+++ b/misc/DtkWidget.pc.in -@@ -1,7 +1,7 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${prefix}/@LIBRARY_INSTALL_DIR@ --includedir=${prefix}/@INCLUDE_INSTALL_DIR@ -+libdir=@LIBRARY_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@ - - Name: dtk@DTK_VERSION_MAJOR@widget - Description: Deepin Tool Kit dtkwidget header files diff --git a/pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch deleted file mode 100644 index cf2faac94855..000000000000 --- a/pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/misc/qt_lib_DtkWidget.pri.in b/misc/qt_lib_DtkWidget.pri.in -index 623878d3..561f5186 100644 ---- a/misc/qt_lib_DtkWidget.pri.in -+++ b/misc/qt_lib_DtkWidget.pri.in -@@ -4,9 +4,9 @@ QT.dtkwidget.MINOR_VERSION = @PROJECT_VERSION_MINOR@ - QT.dtkwidget.PATCH_VERSION = @PROJECT_VERSION_PATCH@ - QT.dtkwidget.name = dtkwidget - QT.dtkwidget.module = dtk@DTK_VERSION_MAJOR@widget --QT.dtkwidget.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@ --QT.dtkwidget.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@ --QT.dtkwidget.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ -+QT.dtkwidget.tools = @TOOL_INSTALL_DIR@ -+QT.dtkwidget.libs = @LIBRARY_INSTALL_DIR@ -+QT.dtkwidget.includes = @INCLUDE_INSTALL_DIR@ - QT.dtkwidget.frameworks = - QT.dtkwidget.depends = core gui dtkcore network concurrent dtkgui printsupport printsupport_private widgets widgets_private gui_private x11extras dbus - QT.dtkwidget.module_config = v2 internal_module ltcg diff --git a/pkgs/desktops/deepin/library/dtkcommon/default.nix b/pkgs/desktops/deepin/library/dtkcommon/default.nix deleted file mode 100644 index 552be6223f97..000000000000 --- a/pkgs/desktops/deepin/library/dtkcommon/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, -}: - -stdenv.mkDerivation rec { - pname = "dtkcommon"; - version = "5.7.13"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-yQKkqHL5W2mHPE3zchAwtWUH55zrCEJwcVWCheC0rW4="; - }; - - nativeBuildInputs = [ cmake ]; - - dontWrapQtApps = true; - - meta = with lib; { - description = "Public project for building DTK Library"; - homepage = "https://github.com/linuxdeepin/dtkcommon"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/dtkcore/default.nix b/pkgs/desktops/deepin/library/dtkcore/default.nix deleted file mode 100644 index 9e39ccb3d4f0..000000000000 --- a/pkgs/desktops/deepin/library/dtkcore/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - doxygen, - libsForQt5, - gsettings-qt, - lshw, - libuchardet, - dtkcommon, - dtklog, -}: - -stdenv.mkDerivation rec { - pname = "dtkcore"; - version = "5.6.32"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-APuBVgewr701wzfTRwaQIg/ERFIhabEs5Jd6+GvD04k="; - }; - - patches = [ - ./fix-pkgconfig-path.patch - ./fix-pri-path.patch - ]; - - postPatch = '' - substituteInPlace misc/DtkCoreConfig.cmake.in \ - --subst-var-by PACKAGE_TOOL_INSTALL_DIR ${placeholder "out"}/libexec/dtk5/DCore/bin - ''; - - nativeBuildInputs = [ - cmake - pkg-config - doxygen - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - dontWrapQtApps = true; - - buildInputs = [ - libsForQt5.qtbase - gsettings-qt - lshw - libuchardet - ]; - - propagatedBuildInputs = [ - dtkcommon - dtklog - ]; - - cmakeFlags = [ - "-DDTK_VERSION=${version}" - "-DBUILD_DOCS=ON" - "-DBUILD_EXAMPLES=OFF" - "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${libsForQt5.qtbase.qtDocPrefix}" - "-DDSG_PREFIX_PATH='/run/current-system/sw'" - "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" - "-DTOOL_INSTALL_DIR=${placeholder "out"}/libexec/dtk5/DCore/bin" - "-DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} - ''; - - outputs = [ - "out" - "dev" - "doc" - ]; - - postFixup = '' - for binary in $out/libexec/dtk5/DCore/bin/*; do - wrapQtApp $binary - done - ''; - - meta = with lib; { - description = "Deepin tool kit core library"; - homepage = "https://github.com/linuxdeepin/dtkcore"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/dtkcore/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtkcore/fix-pkgconfig-path.patch deleted file mode 100644 index 570e34c06147..000000000000 --- a/pkgs/desktops/deepin/library/dtkcore/fix-pkgconfig-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/misc/dtkcore.pc.in b/misc/dtkcore.pc.in -index 83eecb7..da24ce8 100644 ---- a/misc/dtkcore.pc.in -+++ b/misc/dtkcore.pc.in -@@ -1,7 +1,7 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${prefix}/@LIBRARY_INSTALL_DIR@ --includedir=${prefix}/@INCLUDE_INSTALL_DIR@ -+libdir=@LIBRARY_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@ - - Name: dtk@DTK_VERSION_MAJOR@core - Description: Deepin Tool Kit dtkcore header files diff --git a/pkgs/desktops/deepin/library/dtkcore/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtkcore/fix-pri-path.patch deleted file mode 100644 index 19953ed1733d..000000000000 --- a/pkgs/desktops/deepin/library/dtkcore/fix-pri-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/misc/qt_lib_dtkcore.pri.in b/misc/qt_lib_dtkcore.pri.in -index a331f52..ce01dc0 100644 ---- a/misc/qt_lib_dtkcore.pri.in -+++ b/misc/qt_lib_dtkcore.pri.in -@@ -4,9 +4,9 @@ QT.dtkcore.MINOR_VERSION = @PROJECT_VERSION_MINOR@ - QT.dtkcore.PATCH_VERSION = @PROJECT_VERSION_PATCH@ - QT.dtkcore.name = dtkcore - QT.dtkcore.module = dtk@DTK_VERSION_MAJOR@core --QT.dtkcore.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@ --QT.dtkcore.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@ --QT.dtkcore.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ -+QT.dtkcore.tools = @TOOL_INSTALL_DIR@ -+QT.dtkcore.libs = @LIBRARY_INSTALL_DIR@ -+QT.dtkcore.includes = @INCLUDE_INSTALL_DIR@ - QT.dtkcore.frameworks = - QT.dtkcore.depends = core dbus xml - QT.dtkcore.module_config = v2 ltcg diff --git a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix b/pkgs/desktops/deepin/library/dtkdeclarative/default.nix deleted file mode 100644 index ff667f83b65e..000000000000 --- a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - doxygen, - libsForQt5, - dtkgui, -}: - -stdenv.mkDerivation rec { - pname = "dtkdeclarative"; - version = "5.6.32"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-MOiNpuvYwJi9rNKx6TuUuWnlGhmZrRbL48EFapy442M="; - }; - - patches = [ - ./fix-pkgconfig-path.patch - ./fix-pri-path.patch - ]; - - nativeBuildInputs = [ - cmake - pkg-config - doxygen - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - propagatedBuildInputs = [ - dtkgui - libsForQt5.qtdeclarative - libsForQt5.qtquickcontrols2 - libsForQt5.qtgraphicaleffects - ]; - - cmakeFlags = [ - "-DDTK_VERSION=${version}" - "-DBUILD_DOCS=ON" - "-DBUILD_EXAMPLES=ON" - "-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules" - "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${libsForQt5.qtbase.qtDocPrefix}" - "-DQML_INSTALL_DIR=${placeholder "out"}/${libsForQt5.qtbase.qtQmlPrefix}" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} - export QML2_IMPORT_PATH=${libsForQt5.qtdeclarative.bin}/${libsForQt5.qtbase.qtQmlPrefix} - ''; - - outputs = [ - "out" - "dev" - "doc" - ]; - - meta = with lib; { - description = "Widget development toolkit based on QtQuick/QtQml"; - mainProgram = "dtk-exhibition"; - homepage = "https://github.com/linuxdeepin/dtkdeclarative"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/dtkdeclarative/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtkdeclarative/fix-pkgconfig-path.patch deleted file mode 100644 index e15ee2f7a0b8..000000000000 --- a/pkgs/desktops/deepin/library/dtkdeclarative/fix-pkgconfig-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/misc/dtkdeclarative.pc.in b/misc/dtkdeclarative.pc.in -index dc3827f..fd0949e 100644 ---- a/misc/dtkdeclarative.pc.in -+++ b/misc/dtkdeclarative.pc.in -@@ -1,7 +1,7 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${prefix}/@LIB_INSTALL_DIR@ --includedir=${prefix}/@INCLUDE_INSTALL_DIR@ -+libdir=@LIB_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@ - - Name: DtkDeclarative - Description: Deepin Tool Kit DtkDeclarative header files diff --git a/pkgs/desktops/deepin/library/dtkdeclarative/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtkdeclarative/fix-pri-path.patch deleted file mode 100644 index e622809c3936..000000000000 --- a/pkgs/desktops/deepin/library/dtkdeclarative/fix-pri-path.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/misc/qt_lib_dtkdeclarative.pri.in b/misc/qt_lib_dtkdeclarative.pri.in -index 8797802..44e32a3 100644 ---- a/misc/qt_lib_dtkdeclarative.pri.in -+++ b/misc/qt_lib_dtkdeclarative.pri.in -@@ -4,8 +4,8 @@ QT.dtkdeclarative.MINOR_VERSION = @PROJECT_VERSION_MINOR@ - QT.dtkdeclarative.PATCH_VERSION = @PROJECT_VERSION_PATCH@ - QT.dtkdeclarative.name = dtkdeclarative - QT.dtkdeclarative.module = dtk@DTK_VERSION_MAJOR@declarative --QT.dtkdeclarative.libs = @CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@ --QT.dtkdeclarative.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ -+QT.dtkdeclarative.libs = @LIB_INSTALL_DIR@ -+QT.dtkdeclarative.includes = @INCLUDE_INSTALL_DIR@ - QT.dtkdeclarative.frameworks = - QT.dtkdeclarative.depends = core dbus xml gui dtkcore dtkgui quick quick_private - QT.dtkdeclarative.module_config = v2 ltcg diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix deleted file mode 100644 index 16d176b5ff59..000000000000 --- a/pkgs/desktops/deepin/library/dtkgui/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - cmake, - doxygen, - libsForQt5, - dtkcore, - lxqt, - librsvg, -}: - -stdenv.mkDerivation rec { - pname = "dtkgui"; - version = "5.6.32"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-F3tuLV1hWoUZle0O66MQ+Ew9LRnP6N++HaqS88xBLRY="; - }; - - patches = [ - ./fix-pkgconfig-path.patch - ./fix-pri-path.patch - ]; - - postPatch = '' - substituteInPlace src/util/dsvgrenderer.cpp \ - --replace-fail 'QLibrary("rsvg-2", "2")' 'QLibrary("${lib.getLib librsvg}/lib/librsvg-2.so")' - ''; - - nativeBuildInputs = [ - cmake - doxygen - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libsForQt5.qtbase - lxqt.libqtxdg - librsvg - ]; - - propagatedBuildInputs = [ - dtkcore - libsForQt5.qtimageformats - ]; - - cmakeFlags = [ - "-DDTK_VERSION=${version}" - "-DBUILD_DOCS=ON" - "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" - "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${libsForQt5.qtbase.qtDocPrefix}" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} - ''; - - outputs = [ - "out" - "dev" - "doc" - ]; - - postFixup = '' - for binary in $out/libexec/dtk5/DGui/bin/*; do - wrapQtApp $binary - done - ''; - - meta = with lib; { - description = "Deepin Toolkit, gui module for DDE look and feel"; - homepage = "https://github.com/linuxdeepin/dtkgui"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/dtkgui/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtkgui/fix-pkgconfig-path.patch deleted file mode 100644 index 1485baccc204..000000000000 --- a/pkgs/desktops/deepin/library/dtkgui/fix-pkgconfig-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/misc/dtkgui.pc.in b/misc/dtkgui.pc.in -index 89fdbbf..ad817c4 100644 ---- a/misc/dtkgui.pc.in -+++ b/misc/dtkgui.pc.in -@@ -1,8 +1,8 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${prefix}/@LIBRARY_INSTALL_DIR@ --includedir=${prefix}/@INCLUDE_INSTALL_DIR@ --tooldir=${prefix}/@PACKAGE_TOOL_INSTALL_DIR@ -+libdir=@LIBRARY_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@ -+tooldir=@PACKAGE_TOOL_INSTALL_DIR@ - - Name: dtk@DTK_VERSION_MAJOR@gui - Description: Deepin Tool Kit dtkgui header files diff --git a/pkgs/desktops/deepin/library/dtkgui/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtkgui/fix-pri-path.patch deleted file mode 100644 index b746d34b1c79..000000000000 --- a/pkgs/desktops/deepin/library/dtkgui/fix-pri-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/misc/qt_lib_dtkgui.pri.in b/misc/qt_lib_dtkgui.pri.in -index 28308ee..9fb25e6 100644 ---- a/misc/qt_lib_dtkgui.pri.in -+++ b/misc/qt_lib_dtkgui.pri.in -@@ -4,9 +4,9 @@ QT.dtkgui.MINOR_VERSION = @PROJECT_VERSION_MINOR@ - QT.dtkgui.PATCH_VERSION = @PROJECT_VERSION_PATCH@ - QT.dtkgui.name = dtkgui - QT.dtkgui.module = dtk@DTK_VERSION_MAJOR@gui --QT.dtkgui.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@ --QT.dtkgui.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@ --QT.dtkgui.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ -+QT.dtkgui.tools = @TOOL_INSTALL_DIR@ -+QT.dtkgui.libs = @LIBRARY_INSTALL_DIR@ -+QT.dtkgui.includes = @INCLUDE_INSTALL_DIR@ - QT.dtkgui.frameworks = - QT.dtkgui.depends = core gui dtkcore gui_private dbus network - QT.dtkgui.module_config = v2 internal_module ltcg diff --git a/pkgs/desktops/deepin/library/dtklog/default.nix b/pkgs/desktops/deepin/library/dtklog/default.nix deleted file mode 100644 index 7c448ee8e8a8..000000000000 --- a/pkgs/desktops/deepin/library/dtklog/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - spdlog, - systemd, - withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dtklog"; - version = "0.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "dtklog"; - rev = finalAttrs.version; - hash = "sha256-8c3KL6pjAFPC4jRpOpPEbEDRBMWnDptwBSbEtcQcf5E="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - dontWrapQtApps = true; - - buildInputs = [ - libsForQt5.qtbase - spdlog - ] - ++ lib.optional withSystemd systemd; - - cmakeFlags = [ - (lib.cmakeBool "BUILD_WITH_SYSTEMD" withSystemd) - (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") - (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") - ]; - - meta = { - description = "Simple, convinient and thread safe logger for Qt-based C++ apps"; - homepage = "https://github.com/linuxdeepin/dtklog"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -}) diff --git a/pkgs/desktops/deepin/library/dtkwidget/default.nix b/pkgs/desktops/deepin/library/dtkwidget/default.nix deleted file mode 100644 index cc81862d49dd..000000000000 --- a/pkgs/desktops/deepin/library/dtkwidget/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - doxygen, - libsForQt5, - dtkgui, - cups, - gsettings-qt, - libstartup_notification, - xorg, -}: - -stdenv.mkDerivation rec { - pname = "dtkwidget"; - version = "5.6.31"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-FAF66FsmUX0dhFlbT5wAUWkxY0TOU6dcKNwlY10Qou0="; - }; - - patches = [ - ./fix-pkgconfig-path.patch - ./fix-pri-path.patch - ]; - - postPatch = '' - substituteInPlace src/widgets/dapplication.cpp \ - --replace "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);" \ - "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation) << \"$out/share\";" - ''; - - nativeBuildInputs = [ - cmake - doxygen - pkg-config - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - libsForQt5.qtbase - libsForQt5.qtmultimedia - libsForQt5.qtsvg - libsForQt5.qtx11extras - cups - gsettings-qt - libstartup_notification - xorg.libXdmcp - ]; - - propagatedBuildInputs = [ dtkgui ]; - - cmakeFlags = [ - "-DDTK_VERSION=${version}" - "-DBUILD_DOCS=ON" - "-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules" - "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/${libsForQt5.qtbase.qtDocPrefix}" - ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} - ''; - - outputs = [ - "out" - "dev" - "doc" - ]; - - postFixup = '' - for binary in $out/lib/dtk5/DWidget/bin/*; do - wrapQtApp $binary - done - ''; - - meta = with lib; { - description = "Deepin graphical user interface library"; - homepage = "https://github.com/linuxdeepin/dtkwidget"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/dtkwidget/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtkwidget/fix-pkgconfig-path.patch deleted file mode 100644 index df4452259580..000000000000 --- a/pkgs/desktops/deepin/library/dtkwidget/fix-pkgconfig-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/misc/DtkWidget.pc.in b/misc/DtkWidget.pc.in -index 3c610669..b6ed04ca 100644 ---- a/misc/DtkWidget.pc.in -+++ b/misc/DtkWidget.pc.in -@@ -1,7 +1,7 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${prefix}/@LIBRARY_INSTALL_DIR@ --includedir=${prefix}/@INCLUDE_INSTALL_DIR@ -+libdir=@LIBRARY_INSTALL_DIR@ -+includedir=@INCLUDE_INSTALL_DIR@ - - Name: dtk@DTK_VERSION_MAJOR@widget - Description: Deepin Tool Kit dtkwidget header files diff --git a/pkgs/desktops/deepin/library/dtkwidget/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtkwidget/fix-pri-path.patch deleted file mode 100644 index cf2faac94855..000000000000 --- a/pkgs/desktops/deepin/library/dtkwidget/fix-pri-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/misc/qt_lib_DtkWidget.pri.in b/misc/qt_lib_DtkWidget.pri.in -index 623878d3..561f5186 100644 ---- a/misc/qt_lib_DtkWidget.pri.in -+++ b/misc/qt_lib_DtkWidget.pri.in -@@ -4,9 +4,9 @@ QT.dtkwidget.MINOR_VERSION = @PROJECT_VERSION_MINOR@ - QT.dtkwidget.PATCH_VERSION = @PROJECT_VERSION_PATCH@ - QT.dtkwidget.name = dtkwidget - QT.dtkwidget.module = dtk@DTK_VERSION_MAJOR@widget --QT.dtkwidget.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@ --QT.dtkwidget.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@ --QT.dtkwidget.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ -+QT.dtkwidget.tools = @TOOL_INSTALL_DIR@ -+QT.dtkwidget.libs = @LIBRARY_INSTALL_DIR@ -+QT.dtkwidget.includes = @INCLUDE_INSTALL_DIR@ - QT.dtkwidget.frameworks = - QT.dtkwidget.depends = core gui dtkcore network concurrent dtkgui printsupport printsupport_private widgets widgets_private gui_private x11extras dbus - QT.dtkwidget.module_config = v2 internal_module ltcg diff --git a/pkgs/desktops/deepin/library/dwayland/default.nix b/pkgs/desktops/deepin/library/dwayland/default.nix deleted file mode 100644 index 7ea30f488df9..000000000000 --- a/pkgs/desktops/deepin/library/dwayland/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - libsForQt5, - wayland, - wayland-protocols, - wayland-scanner, - extra-cmake-modules, - deepin-wayland-protocols, -}: - -stdenv.mkDerivation rec { - pname = "dwayland"; - version = "5.25.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-XZvL3lauVW5D3r3kybpS3SiitvwEScqgYe2h9c1DuCs="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - libsForQt5.qttools - wayland-scanner - ]; - - buildInputs = [ - libsForQt5.qtbase - libsForQt5.qtwayland - wayland - wayland-protocols - deepin-wayland-protocols - ]; - - dontWrapQtApps = true; - - # cmake requires that the kf5 directory must not empty - postInstall = '' - mkdir $out/include/KF5 - ''; - - meta = with lib; { - description = "Qt-style API to interact with the wayland-client and wayland-server"; - homepage = "https://github.com/linuxdeepin/dwayland"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/gio-qt/default.nix b/pkgs/desktops/deepin/library/gio-qt/default.nix deleted file mode 100644 index 2865174cd041..000000000000 --- a/pkgs/desktops/deepin/library/gio-qt/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - glibmm, - doxygen, - buildDocs ? true, -}: - -stdenv.mkDerivation rec { - pname = "gio-qt"; - version = "0.0.14"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-qDkkLqGsrw+otUy3/iZJJZ2RtpNYPGc/wktdVpw2weg="; - }; - - # Upstream compiles both qt5 and qt6 versions, which is not possible in nixpkgs - # because of the conflict between qt5 hooks and qt6 hooks - postPatch = '' - substituteInPlace {gio-qt,qgio-tools}/CMakeLists.txt \ - --replace "include(qt6.cmake)" " " - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.wrapQtAppsHook - ] - ++ lib.optionals buildDocs [ - doxygen - libsForQt5.qttools - ]; - - cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DPROJECT_VERSION=${version}" - ] - ++ lib.optionals (!buildDocs) [ "-DBUILD_DOCS=OFF" ]; - - propagatedBuildInputs = [ glibmm ]; - - preConfigure = '' - # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" - # A workaround is to set QT_PLUGIN_PATH explicitly - export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} - ''; - - meta = with lib; { - description = "Gio wrapper for Qt applications"; - homepage = "https://github.com/linuxdeepin/gio-qt"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/qt5integration/default.nix b/pkgs/desktops/deepin/library/qt5integration/default.nix deleted file mode 100644 index cd1582acddc7..000000000000 --- a/pkgs/desktops/deepin/library/qt5integration/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - dtkwidget, - cmake, - pkg-config, - libsForQt5, - lxqt, - mtdev, - xorg, - gtest, -}: - -stdenv.mkDerivation rec { - pname = "qt5integration"; - version = "5.6.32"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-WRMeH66X21Z6TBKPEabnWqzC95+OR9M5azxvAp6K7T4="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - dtkwidget - libsForQt5.qtbase - libsForQt5.qtsvg - libsForQt5.qtx11extras - mtdev - lxqt.libqtxdg_3_12 - xorg.xcbutilrenderutil - gtest - ]; - - cmakeFlags = [ - "-DPLUGIN_INSTALL_BASE_DIR=${placeholder "out"}/${libsForQt5.qtbase.qtPluginPrefix}" - ]; - - dontWrapQtApps = true; - - meta = with lib; { - description = "Qt platform theme integration plugins for DDE"; - homepage = "https://github.com/linuxdeepin/qt5integration"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix deleted file mode 100644 index 1f6b059b1c92..000000000000 --- a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - extra-cmake-modules, - pkg-config, - dtkcommon, - libsForQt5, - mtdev, - cairo, - xorg, - wayland, - dwayland, -}: - -stdenv.mkDerivation rec { - pname = "qt5platform-plugins"; - version = "5.6.32"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-jbt+ym6TQX3tecFCSlz8Z2ZnqOa69zYgaB5ohQM3lQg="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - pkg-config - ]; - - buildInputs = [ - dtkcommon - mtdev - cairo - libsForQt5.qtbase - libsForQt5.qtx11extras - xorg.libSM - wayland - dwayland - libsForQt5.qtwayland - ]; - - cmakeFlags = [ - "-DINSTALL_PATH=${placeholder "out"}/${libsForQt5.qtbase.qtPluginPrefix}/platforms" - "-DQT_XCB_PRIVATE_HEADERS=${libsForQt5.qtbase.src}/src/plugins/platforms/xcb" - ]; - - dontWrapQtApps = true; - - meta = with lib; { - description = "Qt platform plugins for DDE"; - homepage = "https://github.com/linuxdeepin/qt5platform-plugins"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/qt6integration/default.nix b/pkgs/desktops/deepin/library/qt6integration/default.nix deleted file mode 100644 index a4796ea96599..000000000000 --- a/pkgs/desktops/deepin/library/qt6integration/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - cmake, - pkg-config, - dtk6widget, - qt6Packages, - gtest, -}: - -stdenv.mkDerivation rec { - pname = "qt6integration"; - version = "6.0.33"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-fxeXjUn1hJUE1Le24sqVEvKBX9Uo8qUVjr3sfz/5cQQ="; - }; - - patches = [ - (fetchpatch { - name = "resolve-compilation-issues-on-Qt-6_9.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/deepin-qt6integration/-/raw/e85e6836919d8e8424e800d7d4c8681bb23c29f9/qt-6.9.patch"; - hash = "sha256-GJH25cOEcA5Zep6FABwlRXU7HfpgMXNJzsbmWQdzx+Y="; - }) - (fetchpatch { - name = "missing-include.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/deepin-qt6integration/-/raw/300e6ac2a166ce214d64c9b16acc57d31de0604a/missing-include.patch"; - hash = "sha256-IFSfnIFcXAcmzfAOId2ew+YUHxHK6+JfJ/t96FR7rhk="; - }) - ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - dtk6widget - qt6Packages.qtbase - gtest - ]; - - cmakeFlags = [ - "-DDTK_VERSION=${version}" - "-DPLUGIN_INSTALL_BASE_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtPluginPrefix}" - ]; - - dontWrapQtApps = true; - - meta = { - description = "Qt platform theme integration plugins for DDE"; - homepage = "https://github.com/linuxdeepin/qt6integration"; - license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/qt6mpris/default.nix b/pkgs/desktops/deepin/library/qt6mpris/default.nix deleted file mode 100644 index a61bc797fa0b..000000000000 --- a/pkgs/desktops/deepin/library/qt6mpris/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - qt6Packages, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "qt6mpris"; - version = "1.0.0.1-1deepin1"; - - src = fetchFromGitHub { - owner = "deepin-community"; - repo = "qt6mpris"; - rev = finalAttrs.version; - hash = "sha256-PCdA9q/txaL2Fbr2/4+Z7L4zxWeULl3bq8MVH3i1g3g="; - }; - - postPatch = '' - substituteInPlace src/src.pro \ - --replace-fail '$$[QT_INSTALL_LIBS]' "$out/lib" \ - --replace-fail '$$[QT_INSTALL_HEADERS]' "$out/include" \ - --replace-fail '$$[QMAKE_MKSPECS]' "$out/mkspecs" - substituteInPlace declarative/declarative.pro \ - --replace-fail '$$[QT_INSTALL_QML]' "$out/${qt6Packages.qtbase.qtQmlPrefix}" - ''; - - nativeBuildInputs = [ - qt6Packages.qmake - ]; - - dontWrapQtApps = true; - - buildInputs = [ - qt6Packages.qtbase - qt6Packages.qtdeclarative - ]; - - meta = { - description = "Qt and QML MPRIS interface and adaptor"; - homepage = "https://github.com/deepin-community/qt6mpris"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -}) diff --git a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix deleted file mode 100644 index 47dcbb28139d..000000000000 --- a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - mtdev, - cairo, - xorg, - qt6Packages, -}: - -stdenv.mkDerivation rec { - pname = "qt6platform-plugins"; - version = "6.0.33"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-uQ/dfk/HEvngTjHDLQOg965Jy+fH2YNfhKwXB+1BoUM="; - }; - - postUnpack = '' - tar -xf ${qt6Packages.qtbase.src} - mv qtbase-everywhere-src-${qt6Packages.qtbase.version}/src/plugins/platforms/xcb ${src.name}/xcb/libqt6xcbqpa-dev/${qt6Packages.qtbase.version} - ''; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - mtdev - cairo - xorg.libSM - qt6Packages.qtbase - ]; - - cmakeFlags = [ - "-DDTK_VERSION=${version}" - "-DINSTALL_PATH=${placeholder "out"}/${qt6Packages.qtbase.qtPluginPrefix}/platforms" - ]; - - dontWrapQtApps = true; - - meta = { - description = "Qt platform plugins for DDE"; - homepage = "https://github.com/linuxdeepin/qt6platform-plugins"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/treeland-protocols/default.nix b/pkgs/desktops/deepin/library/treeland-protocols/default.nix deleted file mode 100644 index d95ced544e04..000000000000 --- a/pkgs/desktops/deepin/library/treeland-protocols/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, -}: - -stdenv.mkDerivation rec { - pname = "treeland-protocols"; - version = "0.4.5"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-SS4jnfr/9Ec3qpnHS4EjQViekBRMix5oz7b9qhNZpfY="; - }; - - nativeBuildInputs = [ - cmake - ]; - - meta = { - description = "Wayland protocol extensions for treeland"; - homepage = "https://github.com/linuxdeepin/treeland-protocols"; - license = with lib.licenses; [ - gpl3Only - lgpl3Only - asl20 - ]; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/udisks2-qt5/default.nix b/pkgs/desktops/deepin/library/udisks2-qt5/default.nix deleted file mode 100644 index 4a39a16f6331..000000000000 --- a/pkgs/desktops/deepin/library/udisks2-qt5/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - libsForQt5, - pkg-config, - udisks, -}: - -stdenv.mkDerivation rec { - pname = "udisks2-qt5"; - version = "5.0.6"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-WS4fmqEYXi5dkn8RvyJBzy3+r+UgFcGDFFpQlbblLu4="; - }; - - nativeBuildInputs = [ - libsForQt5.qmake - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ udisks ]; - - qmakeFlags = [ "VERSION=${version}" ]; - - meta = with lib; { - description = "UDisks2 D-Bus interfaces binding for Qt5"; - homepage = "https://github.com/linuxdeepin/udisks2-qt5"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/library/util-dfm/default.nix b/pkgs/desktops/deepin/library/util-dfm/default.nix deleted file mode 100644 index 977fe68edbc4..000000000000 --- a/pkgs/desktops/deepin/library/util-dfm/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - libmediainfo, - libsecret, - libisoburn, - libuuid, - udisks, -}: - -stdenv.mkDerivation rec { - pname = "util-dfm"; - version = "1.3.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-ngDjjdwuYqvyhaUcMNV5PRmGKC3lmY/nJQGOQgRMIQE="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - dontWrapQtApps = true; - - buildInputs = [ - libsForQt5.qtbase - libmediainfo - libsecret - libuuid - libisoburn - udisks - ]; - - cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DPROJECT_VERSION=${version}" - ]; - - meta = with lib; { - description = "Toolkits of libdfm-io,libdfm-mount and libdfm-burn"; - homepage = "https://github.com/linuxdeepin/util-dfm"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix deleted file mode 100644 index 12316288eaf8..000000000000 --- a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - stdenvNoCC, - lib, - fetchFromGitHub, - nixos-icons, -}: -stdenvNoCC.mkDerivation rec { - pname = "deepin-desktop-base"; - version = "2024.07.24"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-JOC8nQ/YgUpY93FcniO2uypAfsL/SNU+KfTrthoZfQo="; - }; - - makeFlags = [ "DESTDIR=${placeholder "out"}" ]; - - # distribution_logo_transparent.svg come form nixos-artwork(https://github.com/NixOS/nixos-artwork)/logo/nixos-white.svg under CC-BY license, used for dde-lock - postInstall = '' - rm -r $out/etc - rm -r $out/usr/share/python-apt - rm -r $out/usr/share/plymouth - rm -r $out/usr/share/distro-info - mv $out/usr/* $out/ - rm -r $out/usr - install -D ${./distribution_logo_transparent.svg} $out/share/pixmaps/distribution_logo_transparent.svg - cat > $out/share/deepin/distribution.info < - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix deleted file mode 100644 index 8781925b5805..000000000000 --- a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - pkg-config, - deepin-gettext-tools, - libsForQt5, - dtkwidget, - udisks2-qt5, - qt5platform-plugins, - qt5integration, -}: - -stdenv.mkDerivation rec { - pname = "dde-device-formatter"; - version = "0.0.1.16"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-l2D+j+u5Q6G45KTM7eg1QNEakEPtEJ0tzlDlQO5/08I="; - }; - - postPatch = '' - substituteInPlace translate_desktop2ts.sh translate_ts2desktop.sh \ - --replace "/usr/bin/deepin-desktop-ts-convert" "deepin-desktop-ts-convert" - substituteInPlace dde-device-formatter.pro dde-device-formatter.desktop \ - --replace "/usr" "$out" - patchShebangs *.sh - ''; - - nativeBuildInputs = [ - libsForQt5.qmake - libsForQt5.qttools - libsForQt5.wrapQtAppsHook - pkg-config - deepin-gettext-tools - ]; - - buildInputs = [ - dtkwidget - udisks2-qt5 - qt5platform-plugins - qt5integration - libsForQt5.qtx11extras - ]; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - meta = { - description = "Simple graphical interface for creating file system in a block device"; - mainProgram = "dde-device-formatter"; - homepage = "https://github.com/linuxdeepin/dde-device-formatter"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/tools/deepin-anything/default.nix b/pkgs/desktops/deepin/tools/deepin-anything/default.nix deleted file mode 100644 index 0e0bdb7ffa4e..000000000000 --- a/pkgs/desktops/deepin/tools/deepin-anything/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - pkg-config, - libsForQt5, - udisks2-qt5, - util-linux, - libnl, - glib, - pcre, -}: - -stdenv.mkDerivation rec { - pname = "deepin-anything"; - version = "6.2.10"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "deepin-anything"; - rev = version; - hash = "sha256-eGel+pLAYHYkPXQxzTz+lMPSlgNiDFAev2bzGjj4ZFw="; - }; - - postPatch = '' - substituteInPlace src/CMakeLists.txt \ - --replace-fail 'add_subdirectory("kernelmod")' " " - substituteInPlace src/server/backend/CMakeLists.txt \ - --replace-fail "/usr" "$out" \ - --replace-fail "/etc" "$out/etc" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - udisks2-qt5 - util-linux - libnl - libsForQt5.polkit-qt - glib - pcre - ]; - - meta = { - description = "Deepin Anything file search tool"; - homepage = "https://github.com/linuxdeepin/deepin-anything"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; - teams = [ lib.teams.deepin ]; - }; -} diff --git a/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix deleted file mode 100644 index b558c4e963e6..000000000000 --- a/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - gettext, - python3Packages, - perlPackages, -}: - -stdenv.mkDerivation rec { - pname = "deepin-gettext-tools"; - version = "1.0.11"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "sha256-V6X0E80352Vb6zwaBTRfZZnXEVCmBRbO2bca9A9OL6c="; - }; - - postPatch = '' - substituteInPlace src/generate_mo.py --replace "sudo cp" "cp" - ''; - - nativeBuildInputs = [ python3Packages.wrapPython ]; - - buildInputs = [ - gettext - perlPackages.perl - perlPackages.ConfigTiny - perlPackages.XMLLibXML - ]; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - postFixup = '' - wrapPythonPrograms - wrapPythonProgramsIn "$out/lib/${pname}" - wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB - ''; - - meta = with lib; { - description = "Translation file processing utils for DDE development"; - homepage = "https://github.com/linuxdeepin/deepin-gettext-tools"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - teams = [ teams.deepin ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index eefd41f4d9a2..e3cc1f13656b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -700,6 +700,7 @@ mapAliases { deadpixi-sam = deadpixi-sam-unstable; debugedit-unstable = throw "'debugedit-unstable' has been renamed to/replaced by 'debugedit'"; # Converted to throw 2024-10-17 + deepin = throw "the Deepin desktop environment and associated tools have been removed from nixpkgs due to lack of maintenance"; # Added 2025-08-21 degit-rs = throw "'degit-rs' has been removed because it is unmaintained upstream and has vulnerable dependencies."; # Added 2025-07-11 deltachat-cursed = arcanechat-tui; # added 2025-02-25 deltachat-electron = throw "'deltachat-electron' has been renamed to/replaced by 'deltachat-desktop'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10e0970bcbe2..c00a8540435e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14604,8 +14604,6 @@ with pkgs; appls = [ prio ]; }; - deepin = recurseIntoAttrs (callPackage ../desktops/deepin { }); - enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { }); expidus = recurseIntoAttrs ( diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 8e87e80b1a65..2c9d32830b84 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -715,6 +715,7 @@ in zfs = throw "linuxPackages.zfs has been removed, use zfs_* instead, or linuxPackages.\${pkgs.zfs.kernelModuleAttribute}"; # added 2025-01-23 zfs_2_1 = throw "zfs_2_1 has been removed"; # added 2024-12-25; ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18; + deepin-anything-module = throw "the Deepin desktop environment and associated tools have been removed from nixpkgs due to lack of maintenance"; hid-nintendo = throw "hid-nintendo was added in mainline kernel version 5.16"; # Added 2023-07-30 sch_cake = throw "sch_cake was added in mainline kernel version 4.19"; # Added 2023-06-14 rtl8723bs = throw "rtl8723bs was added in mainline kernel version 4.12"; # Added 2023-06-14