diff --git a/pkgs/by-name/gn/gnome-session/fix-paths.patch b/pkgs/by-name/gn/gnome-session/fix-paths.patch index 38805c645b95..22f06ddfd2e8 100644 --- a/pkgs/by-name/gn/gnome-session/fix-paths.patch +++ b/pkgs/by-name/gn/gnome-session/fix-paths.patch @@ -6,10 +6,10 @@ index b4b1f8fa..99d52cba 100755 [ "x$XDG_SESSION_CLASS" != "xgreeter" ] && [ -n "$SHELL" ]; then if [ "$1" != '-l' ]; then -- exec bash -c "exec -l '$SHELL' -c '$0 -l $*'" +- exec bash -c "exec -l '$SHELL' -c 'exec $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 $*'" ++ exec @bash@ -c "exec -l '$SHELL' -c 'exec $0 -l $*'" else shift fi diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix index 0d825cbaa39a..d60b3ca2d110 100644 --- a/pkgs/by-name/gn/gnome-session/package.nix +++ b/pkgs/by-name/gn/gnome-session/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-session"; # Also bump ./ctl.nix when bumping major version. - version = "47.0.1"; + version = "48.0"; outputs = [ "out" @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-session/${lib.versions.major finalAttrs.version}/gnome-session-${finalAttrs.version}.tar.xz"; - hash = "sha256-Vq6caOSZlXk+sglrzcRTOxEWaeHlTItuCx2VL2peinA="; + hash = "sha256-3ZCfvFsizb2y/E3xpH140bWUPMxeYeaiChhGJGNHxBc="; }; patches = [