dde-session-shell: 5.6.4 -> 6.0.10

rewine 9e079d77 f4d6cca7

+15 -16
+15 -16
pkgs/desktops/deepin/core/dde-session-shell/default.nix
··· 2 2 , lib 3 3 , fetchFromGitHub 4 4 , linkFarm 5 - , dtkwidget 6 - , qt5integration 7 - , qt5platform-plugins 8 - , dde-qt-dbus-factory 9 5 , cmake 10 6 , pkg-config 11 7 , qttools 12 - , qtx11extras 13 8 , wrapQtAppsHook 14 9 , wrapGAppsHook 10 + , qtbase 11 + , dtkwidget 12 + , qt5integration 13 + , qt5platform-plugins 14 + , deepin-pw-check 15 15 , gsettings-qt 16 16 , lightdm_qt 17 + , qtx11extras 17 18 , linux-pam 18 19 , xorg 19 - , kwayland 20 20 , gtest 21 21 , xkeyboard_config 22 22 , dbus 23 - , qtbase 24 23 , dde-session-shell 25 24 }: 25 + 26 26 stdenv.mkDerivation rec { 27 27 pname = "dde-session-shell"; 28 - version = "5.6.4"; 28 + version = "6.0.10"; 29 29 30 30 src = fetchFromGitHub { 31 31 owner = "linuxdeepin"; 32 32 repo = pname; 33 33 rev = version; 34 - sha256 = "sha256-mrdGu4t86d3No23IrnjypVLx1jxaySatr0xPMY9l5S4"; 34 + hash = "sha256-h4X3RZe7+CxVeFmk/7+7K4d/2D1+jhECKQaxl4TsuvM="; 35 35 }; 36 36 37 37 postPatch = '' 38 - substituteInPlace src/lightdm-deepin-greeter/greeterworker.cpp \ 39 - --replace "/usr/include/shadow.h" "shadow.h" 40 - 41 38 substituteInPlace scripts/lightdm-deepin-greeter files/wayland/lightdm-deepin-greeter-wayland \ 42 39 --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" 43 40 44 41 substituteInPlace src/session-widgets/auth_module.h \ 45 42 --replace "/usr/lib/dde-control-center" "/run/current-system/sw/lib/dde-control-center" 46 43 47 - substituteInPlace src/global_util/plugin_manager/modules_loader.cpp \ 44 + substituteInPlace src/global_util/modules_loader.cpp \ 48 45 --replace "/usr/lib/dde-session-shell/modules" "/run/current-system/sw/lib/dde-session-shell/modules" 49 46 50 47 substituteInPlace src/{session-widgets/{lockcontent.cpp,userinfo.cpp},widgets/fullscreenbackground.cpp} \ ··· 53 50 substituteInPlace src/global_util/xkbparser.h \ 54 51 --replace "/usr/share/X11/xkb/rules/base.xml" "${xkeyboard_config}/share/X11/xkb/rules/base.xml" 55 52 56 - substituteInPlace files/{com.deepin.dde.shutdownFront.service,com.deepin.dde.lockFront.service} \ 53 + substituteInPlace files/{org.deepin.dde.ShutdownFront1.service,org.deepin.dde.LockFront1.service} \ 57 54 --replace "/usr/bin/dbus-send" "${dbus}/bin/dbus-send" \ 58 55 --replace "/usr/share" "$out/share" 59 56 ··· 73 70 dontWrapGApps = true; 74 71 75 72 buildInputs = [ 73 + qtbase 76 74 dtkwidget 77 75 qt5platform-plugins 78 - dde-qt-dbus-factory 76 + deepin-pw-check 79 77 gsettings-qt 80 78 lightdm_qt 81 79 qtx11extras 82 80 linux-pam 83 - kwayland 84 81 xorg.libXcursor 85 82 xorg.libXtst 86 83 xorg.libXrandr 87 84 xorg.libXdmcp 88 85 gtest 89 86 ]; 87 + 88 + outputs = [ "out" "dev" ]; 90 89 91 90 # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 92 91 qtWrapperArgs = [