dde-session-ui: 5.6.2 -> 6.0.10
This commit is contained in:
parent
9e079d770a
commit
7613b21f12
1 changed files with 14 additions and 38 deletions
|
@ -1,39 +1,29 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, qttools
|
||||
, wrapQtAppsHook
|
||||
, qtbase
|
||||
, dtkwidget
|
||||
, qt5integration
|
||||
, qt5platform-plugins
|
||||
, pkg-config
|
||||
, cmake
|
||||
, dde-dock
|
||||
, dde-qt-dbus-factory
|
||||
, deepin-gettext-tools
|
||||
, gsettings-qt
|
||||
, lightdm_qt
|
||||
, qttools
|
||||
, qtx11extras
|
||||
, util-linux
|
||||
, xorg
|
||||
, pcre
|
||||
, libselinux
|
||||
, libsepol
|
||||
, wrapQtAppsHook
|
||||
, gtest
|
||||
, xkeyboard_config
|
||||
, qtbase
|
||||
, dbus
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-session-ui";
|
||||
version = "5.6.2";
|
||||
version = "6.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-3lW/M07b6gXzGcvQYB+Ojqdq7TfJBaMIKfmfG7o3wWg=";
|
||||
hash = "sha256-JwktVbwWdfqURhZuEFdB5oaKMsBZu5DekpZ2WGpcL4Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -41,22 +31,10 @@ stdenv.mkDerivation rec {
|
|||
--replace "/usr/share/backgrounds" "/run/current-system/sw/share/backgrounds" \
|
||||
--replace "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers"
|
||||
|
||||
substituteInPlace global_util/xkbparser.h \
|
||||
--replace "/usr/share/X11/xkb/rules/base.xml" "${xkeyboard_config}/share/X11/xkb/rules/base.xml"
|
||||
|
||||
substituteInPlace dde-warning-dialog/com.deepin.dde.WarningDialog.service dde-osd/files/dde-osd.desktop dde-welcome/com.deepin.dde.welcome.service \
|
||||
substituteInPlace dde-warning-dialog/src/org.deepin.dde.WarningDialog1.service dde-welcome/src/org.deepin.dde.Welcome1.service \
|
||||
--replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon"
|
||||
|
||||
substituteInPlace dde-osd/notification/bubbletool.cpp \
|
||||
--replace "/usr/share" "/run/current-system/sw/share"
|
||||
|
||||
substituteInPlace dde-osd/files/{com.deepin.dde.Notification.service,com.deepin.dde.freedesktop.Notification.service,com.deepin.dde.osd.service} \
|
||||
--replace "/usr/bin/dbus-send" "${dbus}/bin/dbus-send" \
|
||||
--replace "/usr/share" "$out/share"
|
||||
|
||||
substituteInPlace dde-lowpower/main.cpp dmemory-warning-dialog/main.cpp dde-touchscreen-dialog/main.cpp dnetwork-secret-dialog/main.cpp dde-suspend-dialog/main.cpp \
|
||||
dde-warning-dialog/main.cpp dde-bluetooth-dialog/main.cpp dde-welcome/main.cpp dde-hints-dialog/main.cpp dde-osd/main.cpp dde-wm-chooser/main.cpp \
|
||||
dde-license-dialog/{content.cpp,main.cpp} dmemory-warning-dialog/com.deepin.dde.MemoryWarningDialog.service \
|
||||
substituteInPlace dmemory-warning-dialog/src/org.deepin.dde.MemoryWarningDialog1.service \
|
||||
--replace "/usr" "$out"
|
||||
'';
|
||||
|
||||
|
@ -64,25 +42,23 @@ stdenv.mkDerivation rec {
|
|||
cmake
|
||||
pkg-config
|
||||
qttools
|
||||
deepin-gettext-tools
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
dtkwidget
|
||||
qt5platform-plugins
|
||||
dde-dock
|
||||
dde-qt-dbus-factory
|
||||
gsettings-qt
|
||||
qtx11extras
|
||||
pcre
|
||||
xorg.libXdmcp
|
||||
util-linux
|
||||
libselinux
|
||||
libsepol
|
||||
gtest
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DDISABLE_SYS_UPDATE=ON"
|
||||
];
|
||||
|
||||
# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
|
||||
qtWrapperArgs = [
|
||||
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
|
||||
|
|
Loading…
Reference in a new issue