JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

gnome3.gnome-session: 3.36.0 -> 3.38.0

Browse Source 
* regenerate fix-paths.patch
* set systemd_session to default

https://gitlab.gnome.org/GNOME/gnome-session/-/blob/3.38.0/NEWS
This commit is contained in:
Piotr Bogdan 2020-08-20 19:08:30 +01:00 committed by Jan Tojnar
parent a17b2aa43d
commit 493fa52249
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/desktops/gnome-3/core/gnome-session/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-session"; pname = "gnome-session";
version = "3.36.0"; version = "3.38.0";
outputs = ["out" "sessions"]; outputs = ["out" "sessions"];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0ymvf1bap35348rpjqp63qwnwnnawdwi4snch95zc4n832w3hjym"; sha256 = "0rrxjk3vbqy3cdgnl7rw71dvcyrvhwq3m6s53dnkyjxsrnr0xk3v";
}; };
patches = [ patches = [
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
}) })
]; ];
mesonFlags = [ "-Dsystemd=true" ]; mesonFlags = [ "-Dsystemd=true" "-Dsystemd_session=default" ];
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkgconfig gettext makeWrapper meson ninja pkgconfig gettext makeWrapper

16
pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
View File

@ -1,6 +1,8 @@
diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in
index ddd1a591..46a3488b 100755
--- a/gnome-session/gnome-session.in --- a/gnome-session/gnome-session.in
+++ b/gnome-session/gnome-session.in +++ b/gnome-session/gnome-session.in
@@ -3,11 +3,13 @@ @@ -3,17 +3,19 @@
if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
[ "x$XDG_SESSION_CLASS" != "xgreeter" ] && [ "x$XDG_SESSION_CLASS" != "xgreeter" ] &&
[ -n "$SHELL" ] && [ -n "$SHELL" ] &&
@ -12,24 +14,24 @@
+ ! (echo "$SHELL" | @grep@ -q "nologin"); then + ! (echo "$SHELL" | @grep@ -q "nologin"); then
if [ "$1" != '-l' ]; then if [ "$1" != '-l' ]; then
- exec bash -c "exec -l '$SHELL' -c '$0 -l $*'" - exec bash -c "exec -l '$SHELL' -c '$0 -l $*'"
+ # Make sure the shell actually sets up the environment + # Make sure the shell actually sets up the environment.
+ unset __NIXOS_SET_ENVIRONMENT_DONE + unset __NIXOS_SET_ENVIRONMENT_DONE
+ exec @bash@ -c "exec -l '$SHELL' -c '$0 -l $*'" + exec @bash@ -c "exec -l '$SHELL' -c '$0 -l $*'"
else else
shift shift
fi fi
@@ -13,7 +13,7 @@
fi
fi fi
-SETTING=$(G_MESSAGES_DEBUG= gsettings get org.gnome.system.locale region) -SETTING=$(G_MESSAGES_DEBUG='' gsettings get org.gnome.system.locale region)
+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=${SETTING#\'}
REGION=${REGION%\'} REGION=${REGION%\'}
diff --git a/gnome-session/main.c b/gnome-session/main.c
index 84edfbe5..e5285489 100644
--- a/gnome-session/main.c --- a/gnome-session/main.c
+++ b/gnome-session/main.c +++ b/gnome-session/main.c
@@ -203,7 +203,7 @@ @@ -215,7 +215,7 @@ require_dbus_session (int argc,
} }
new_argv[i + 2] = NULL; new_argv[i + 2] = NULL;