audiobookshelf: 2.18.1 -> 2.19.0 (#378967)
[NixPkgs.git] / pkgs / by-name / bu / budgie-session / fix-paths.patch
blob1c011d26b54926514a443f512a1961fe394532ed
1 diff --git a/gnome-session/budgie-session.in b/gnome-session/budgie-session.in
2 index 8a91e061..3e2ef031 100755
3 --- a/gnome-session/budgie-session.in
4 +++ b/gnome-session/budgie-session.in
5 @@ -7,13 +7,15 @@ if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
6 ! (echo "$SHELL" | grep -q "false") &&
7 ! (echo "$SHELL" | grep -q "nologin"); then
8 if [ "$1" != '-l' ]; then
9 - exec bash -c "exec -l '$SHELL' -c '$0 -l $*'"
10 + # Make sure the shell actually sets up the environment.
11 + unset __NIXOS_SET_ENVIRONMENT_DONE
12 + exec @bash@ -c "exec -l '$SHELL' -c '$0 -l $*'"
13 else
14 shift
18 -SETTING=$(G_MESSAGES_DEBUG='' gsettings get org.gnome.system.locale region)
19 +SETTING=$(G_MESSAGES_DEBUG='' @gsettings@ get org.gnome.system.locale region)
20 REGION=${SETTING#\'}
21 REGION=${REGION%\'}
23 diff --git a/gnome-session/main.c b/gnome-session/main.c
24 index 327c7c7f..301ec7ee 100644
25 --- a/gnome-session/main.c
26 +++ b/gnome-session/main.c
27 @@ -219,7 +219,7 @@ require_dbus_session (int argc,
29 new_argv[i + 2] = NULL;
31 - if (!execvp ("dbus-launch", new_argv)) {
32 + if (!execvp ("@dbusLaunch@", new_argv)) {
33 g_set_error (error,
34 G_SPAWN_ERROR,
35 G_SPAWN_ERROR_FAILED,