diff options
Diffstat (limited to 'pkgs')
5 files changed, 7 insertions, 96 deletions
diff --git a/pkgs/desktops/deepin/core/dde-dock/default.nix b/pkgs/desktops/deepin/core/dde-dock/default.nix deleted file mode 100644 index db3a4a052334c..0000000000000 --- a/pkgs/desktops/deepin/core/dde-dock/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - cmake, - extra-cmake-modules, - qttools, - pkg-config, - wrapQtAppsHook, - wrapGAppsHook3, - qtbase, - dtkwidget, - qt5integration, - qt5platform-plugins, - dwayland, - qtx11extras, - gsettings-qt, - libdbusmenu, - xorg, -}: - -stdenv.mkDerivation rec { - pname = "dde-dock"; - version = "6.0.37"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - hash = "sha256-5VowwQ0NoV6jV6DwnoxPKnRi6n28Teh/UQZwRc3URWY="; - }; - - postPatch = '' - substituteInPlace plugins/pluginmanager/pluginmanager.cpp frame/controller/quicksettingcontroller.cpp \ - --replace "/usr/lib/dde-dock" "/run/current-system/sw/lib/dde-dock" - - substituteInPlace configs/com.deepin.dde.dock.json frame/util/common.h \ - --replace "/usr" "/run/current-system/sw" - - 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 - ''; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - qttools - pkg-config - wrapQtAppsHook - wrapGAppsHook3 - ]; - dontWrapGApps = true; - - buildInputs = [ - qtbase - dtkwidget - qt5platform-plugins - dwayland - qtx11extras - gsettings-qt - libdbusmenu - xorg.libXcursor - xorg.libXtst - xorg.libXdmcp - xorg.libXres - ]; - - outputs = [ - "out" - "dev" - ]; - - cmakeFlags = [ "-DVERSION=${version}" ]; - - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ]; - - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - meta = with lib; { - description = "Deepin desktop-environment - dock module"; - mainProgram = "dde-dock"; - homepage = "https://github.com/linuxdeepin/dde-dock"; - platforms = platforms.linux; - license = licenses.lgpl3Plus; - maintainers = teams.deepin.members; - }; -} diff --git a/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/pkgs/desktops/deepin/core/dde-grand-search/default.nix index ab5cd2f03039b..11f2d4d403f4b 100644 --- a/pkgs/desktops/deepin/core/dde-grand-search/default.nix +++ b/pkgs/desktops/deepin/core/dde-grand-search/default.nix @@ -8,7 +8,7 @@ wrapQtAppsHook, dtkwidget, dde-qt-dbus-factory, - dde-dock, + dde-tray-loader, deepin-pdfium, qt5integration, qt5platform-plugins, @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ dtkwidget - dde-dock + dde-tray-loader dde-qt-dbus-factory deepin-pdfium qt5integration diff --git a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix index bdbd5e1b136be..0581339c254f3 100644 --- a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix +++ b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix @@ -7,6 +7,7 @@ startdde, dde-session-shell, dde-file-manager, + dde-tray-loader, deepin-desktop-schemas, deepin-movie-reborn, deepin-system-monitor, @@ -21,6 +22,7 @@ let startdde dde-session-shell dde-file-manager + dde-tray-loader deepin-desktop-schemas deepin-movie-reborn deepin-system-monitor diff --git a/pkgs/desktops/deepin/core/dde-session-ui/default.nix b/pkgs/desktops/deepin/core/dde-session-ui/default.nix index a2ce7f0090212..4a7e5cf9b0168 100644 --- a/pkgs/desktops/deepin/core/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/core/dde-session-ui/default.nix @@ -10,7 +10,7 @@ dtkwidget, qt5integration, qt5platform-plugins, - dde-dock, + dde-tray-loader, gsettings-qt, qtx11extras, gtest, @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { qtbase dtkwidget qt5platform-plugins - dde-dock + dde-tray-loader gsettings-qt qtx11extras gtest diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 52f917a9c996d..4d3ca683845a4 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -48,7 +48,6 @@ let dde-control-center = callPackage ./core/dde-control-center { }; dde-calendar = callPackage ./core/dde-calendar { }; dde-clipboard = callPackage ./core/dde-clipboard { }; - dde-dock = callPackage ./core/dde-dock { }; dde-file-manager = callPackage ./core/dde-file-manager { }; dde-launchpad = callPackage ./core/dde-launchpad { }; dde-network-core = callPackage ./core/dde-network-core { }; @@ -110,6 +109,7 @@ let // 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 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 |