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