mirror of
https://github.com/hyprwm/Hyprland.git
synced 2024-08-17 17:20:57 +03:00
dbus: import PATH XDG_DATA_DIRS variables into systemd and dbus session
This commit is contained in:
parent
7f09646ab8
commit
315f16d501
@ -311,10 +311,10 @@ void CCompositor::cleanEnvironment() {
|
|||||||
if (m_sWLRSession) {
|
if (m_sWLRSession) {
|
||||||
const auto CMD =
|
const auto CMD =
|
||||||
#ifdef USES_SYSTEMD
|
#ifdef USES_SYSTEMD
|
||||||
"systemctl --user unset-environment DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP QT_QPA_PLATFORMTHEME && hash "
|
"systemctl --user unset-environment DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP QT_QPA_PLATFORMTHEME PATH XDG_DATA_DIRS && hash "
|
||||||
"dbus-update-activation-environment 2>/dev/null && "
|
"dbus-update-activation-environment 2>/dev/null && "
|
||||||
#endif
|
#endif
|
||||||
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP HYPRLAND_INSTANCE_SIGNATURE QT_QPA_PLATFORMTHEME";
|
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP HYPRLAND_INSTANCE_SIGNATURE QT_QPA_PLATFORMTHEME PATH XDG_DATA_DIRS";
|
||||||
g_pKeybindManager->spawn(CMD);
|
g_pKeybindManager->spawn(CMD);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -569,10 +569,10 @@ void CCompositor::startCompositor() {
|
|||||||
if (m_sWLRSession /* Session-less Hyprland usually means a nest, don't update the env in that case */) {
|
if (m_sWLRSession /* Session-less Hyprland usually means a nest, don't update the env in that case */) {
|
||||||
const auto CMD =
|
const auto CMD =
|
||||||
#ifdef USES_SYSTEMD
|
#ifdef USES_SYSTEMD
|
||||||
"systemctl --user import-environment DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP QT_QPA_PLATFORMTHEME && hash "
|
"systemctl --user import-environment DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP QT_QPA_PLATFORMTHEME PATH XDG_DATA_DIRS && hash "
|
||||||
"dbus-update-activation-environment 2>/dev/null && "
|
"dbus-update-activation-environment 2>/dev/null && "
|
||||||
#endif
|
#endif
|
||||||
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP HYPRLAND_INSTANCE_SIGNATURE QT_QPA_PLATFORMTHEME";
|
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP HYPRLAND_INSTANCE_SIGNATURE QT_QPA_PLATFORMTHEME PATH XDG_DATA_DIRS";
|
||||||
g_pKeybindManager->spawn(CMD);
|
g_pKeybindManager->spawn(CMD);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1282,10 +1282,10 @@ void CConfigManager::dispatchExecOnce() {
|
|||||||
if (g_pCompositor->m_sWLRSession)
|
if (g_pCompositor->m_sWLRSession)
|
||||||
handleRawExec("",
|
handleRawExec("",
|
||||||
#ifdef USES_SYSTEMD
|
#ifdef USES_SYSTEMD
|
||||||
"systemctl --user import-environment DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP QT_QPA_PLATFORMTHEME && hash "
|
"systemctl --user import-environment DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP QT_QPA_PLATFORMTHEME PATH XDG_DATA_DIRS && hash "
|
||||||
"dbus-update-activation-environment 2>/dev/null && "
|
"dbus-update-activation-environment 2>/dev/null && "
|
||||||
#endif
|
#endif
|
||||||
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP HYPRLAND_INSTANCE_SIGNATURE QT_QPA_PLATFORMTHEME");
|
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP HYPRLAND_INSTANCE_SIGNATURE QT_QPA_PLATFORMTHEME PATH XDG_DATA_DIRS");
|
||||||
|
|
||||||
firstExecDispatched = true;
|
firstExecDispatched = true;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user