dde-dock: 5.5.81 -> 6.0.22

rewine fdc46fb8 f21a5f64

+22 -22
+22 -22
pkgs/desktops/deepin/core/dde-dock/default.nix
··· 1 1 { stdenv 2 2 , lib 3 + , fetchpatch 3 4 , fetchFromGitHub 4 - , dtkwidget 5 - , dde-qt-dbus-factory 6 - , qt5integration 7 - , qt5platform-plugins 8 - , dde-control-center 9 - , deepin-desktop-schemas 10 5 , cmake 6 + , extra-cmake-modules 11 7 , qttools 12 - , qtx11extras 13 8 , pkg-config 14 9 , wrapQtAppsHook 15 10 , wrapGAppsHook 11 + , qtbase 12 + , dtkwidget 13 + , qt5integration 14 + , qt5platform-plugins 15 + , dwayland 16 + , qtx11extras 16 17 , gsettings-qt 17 18 , libdbusmenu 18 19 , xorg 19 - , gtest 20 - , qtbase 21 20 }: 22 21 23 22 stdenv.mkDerivation rec { 24 23 pname = "dde-dock"; 25 - version = "5.5.81"; 24 + version = "6.0.22"; 26 25 27 26 src = fetchFromGitHub { 28 27 owner = "linuxdeepin"; 29 28 repo = pname; 30 29 rev = version; 31 - sha256 = "sha256-x8U5QPfIykaQLjwbErZiYbZC+JyPQQ+jd6MBjDQyUjs="; 30 + hash = "sha256-fhc2faiPH35ZKw6SCoGTz+6mgxabNpCFQeY2p68Ba5w="; 32 31 }; 33 32 34 33 postPatch = '' 35 - substituteInPlace plugins/tray/system-trays/systemtrayscontroller.cpp frame/controller/dockpluginscontroller.cpp \ 36 - --replace "/usr/lib/dde-dock/plugins" "/run/current-system/sw/lib/dde-dock/plugins" 34 + substituteInPlace plugins/pluginmanager/pluginmanager.cpp frame/controller/quicksettingcontroller.cpp \ 35 + --replace "/usr/lib/dde-dock" "/run/current-system/sw/lib/dde-dock" 37 36 38 - substituteInPlace plugins/show-desktop/showdesktopplugin.cpp frame/window/components/desktop_widget.cpp \ 39 - --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" 37 + substituteInPlace configs/com.deepin.dde.dock.json frame/util/common.h \ 38 + --replace "/usr" "/run/current-system/sw" 40 39 41 - substituteInPlace plugins/{dcc-dock-plugin/settings_module.cpp,tray/system-trays/systemtrayscontroller.cpp} \ 42 - --replace "/usr" "$out" 43 - ''; 40 + for file in $(grep -rl "/usr/lib/deepin-daemon"); do 41 + substituteInPlace $file --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" 42 + done 43 + ''; 44 44 45 45 nativeBuildInputs = [ 46 46 cmake 47 + extra-cmake-modules 47 48 qttools 48 49 pkg-config 49 50 wrapQtAppsHook ··· 52 53 dontWrapGApps = true; 53 54 54 55 buildInputs = [ 56 + qtbase 55 57 dtkwidget 56 58 qt5platform-plugins 57 - dde-qt-dbus-factory 58 - dde-control-center 59 - deepin-desktop-schemas 59 + dwayland 60 60 qtx11extras 61 61 gsettings-qt 62 62 libdbusmenu 63 63 xorg.libXcursor 64 64 xorg.libXtst 65 65 xorg.libXdmcp 66 - gtest 66 + xorg.libXres 67 67 ]; 68 68 69 69 outputs = [ "out" "dev" ];