diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-30 00:12:10 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-30 00:12:10 +0000 |
commit | b0233d387cce36e7f5f9d94d86539972a5bbd2e3 (patch) | |
tree | 75aa1515923458281c2c3a623a234471fddef386 /pkgs/desktops/budgie/budgie-session/fix-paths.patch | |
parent | c2791e85dedb9672f95e34dc1ec39d77b79c86c1 (diff) | |
parent | fb15daf152589b58ba1e1194968a545faa7fbe5a (diff) |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/desktops/budgie/budgie-session/fix-paths.patch')
-rw-r--r-- | pkgs/desktops/budgie/budgie-session/fix-paths.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/pkgs/desktops/budgie/budgie-session/fix-paths.patch b/pkgs/desktops/budgie/budgie-session/fix-paths.patch new file mode 100644 index 0000000000000..1c011d26b5492 --- /dev/null +++ b/pkgs/desktops/budgie/budgie-session/fix-paths.patch @@ -0,0 +1,35 @@ +diff --git a/gnome-session/budgie-session.in b/gnome-session/budgie-session.in +index 8a91e061..3e2ef031 100755 +--- a/gnome-session/budgie-session.in ++++ b/gnome-session/budgie-session.in +@@ -7,13 +7,15 @@ if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && + ! (echo "$SHELL" | grep -q "false") && + ! (echo "$SHELL" | grep -q "nologin"); then + if [ "$1" != '-l' ]; then +- exec bash -c "exec -l '$SHELL' -c '$0 -l $*'" ++ # Make sure the shell actually sets up the environment. ++ unset __NIXOS_SET_ENVIRONMENT_DONE ++ exec @bash@ -c "exec -l '$SHELL' -c '$0 -l $*'" + else + shift + fi + fi + +-SETTING=$(G_MESSAGES_DEBUG='' gsettings get org.gnome.system.locale region) ++SETTING=$(G_MESSAGES_DEBUG='' @gsettings@ get org.gnome.system.locale region) + REGION=${SETTING#\'} + REGION=${REGION%\'} + +diff --git a/gnome-session/main.c b/gnome-session/main.c +index 327c7c7f..301ec7ee 100644 +--- a/gnome-session/main.c ++++ b/gnome-session/main.c +@@ -219,7 +219,7 @@ require_dbus_session (int argc, + } + new_argv[i + 2] = NULL; + +- if (!execvp ("dbus-launch", new_argv)) { ++ if (!execvp ("@dbusLaunch@", new_argv)) { + g_set_error (error, + G_SPAWN_ERROR, + G_SPAWN_ERROR_FAILED, |