diff --git a/pkgs/desktops/deepin/core/dde-dock/default.nix b/pkgs/desktops/deepin/core/dde-dock/default.nix index 32e8ca97b6d1..5ea7da4ed201 100644 --- a/pkgs/desktops/deepin/core/dde-dock/default.nix +++ b/pkgs/desktops/deepin/core/dde-dock/default.nix @@ -1,49 +1,50 @@ { stdenv , lib +, fetchpatch , fetchFromGitHub -, dtkwidget -, dde-qt-dbus-factory -, qt5integration -, qt5platform-plugins -, dde-control-center -, deepin-desktop-schemas , cmake +, extra-cmake-modules , qttools -, qtx11extras , pkg-config , wrapQtAppsHook , wrapGAppsHook +, qtbase +, dtkwidget +, qt5integration +, qt5platform-plugins +, dwayland +, qtx11extras , gsettings-qt , libdbusmenu , xorg -, gtest -, qtbase }: stdenv.mkDerivation rec { pname = "dde-dock"; - version = "5.5.81"; + version = "6.0.22"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-x8U5QPfIykaQLjwbErZiYbZC+JyPQQ+jd6MBjDQyUjs="; + hash = "sha256-fhc2faiPH35ZKw6SCoGTz+6mgxabNpCFQeY2p68Ba5w="; }; postPatch = '' - substituteInPlace plugins/tray/system-trays/systemtrayscontroller.cpp frame/controller/dockpluginscontroller.cpp \ - --replace "/usr/lib/dde-dock/plugins" "/run/current-system/sw/lib/dde-dock/plugins" + substituteInPlace plugins/pluginmanager/pluginmanager.cpp frame/controller/quicksettingcontroller.cpp \ + --replace "/usr/lib/dde-dock" "/run/current-system/sw/lib/dde-dock" - substituteInPlace plugins/show-desktop/showdesktopplugin.cpp frame/window/components/desktop_widget.cpp \ - --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" + substituteInPlace configs/com.deepin.dde.dock.json frame/util/common.h \ + --replace "/usr" "/run/current-system/sw" - substituteInPlace plugins/{dcc-dock-plugin/settings_module.cpp,tray/system-trays/systemtrayscontroller.cpp} \ - --replace "/usr" "$out" - ''; + 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 @@ -52,18 +53,17 @@ stdenv.mkDerivation rec { dontWrapGApps = true; buildInputs = [ + qtbase dtkwidget qt5platform-plugins - dde-qt-dbus-factory - dde-control-center - deepin-desktop-schemas + dwayland qtx11extras gsettings-qt libdbusmenu xorg.libXcursor xorg.libXtst xorg.libXdmcp - gtest + xorg.libXres ]; outputs = [ "out" "dev" ];