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

pantheon.elementary-session-settings: Drop x11 session (#443289)

Browse Source
This commit is contained in:
Bobby Rong
2025-09-18 12:31:41 +00:00
committed by GitHub
parent dcfec31546 d89600b7e9
commit 0147c2f1d5
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2511.section.md
View File

@@ -254,7 +254,7 @@
- mate-wayland-session 1.28.4 is now using the default wayfire decorator instead of firedecor, thus `services.xserver.desktopManager.mate.enableWaylandSession` is no longer shipping firedecor. If you are experiencing broken window decorations after upgrade, backup and remove `~/.config/mate/wayfire.ini` and re-login. - mate-wayland-session 1.28.4 is now using the default wayfire decorator instead of firedecor, thus `services.xserver.desktopManager.mate.enableWaylandSession` is no longer shipping firedecor. If you are experiencing broken window decorations after upgrade, backup and remove `~/.config/mate/wayfire.ini` and re-login.
- Due to [deprecation of gnome-session X11 support](https://blogs.gnome.org/alatiera/2025/06/08/the-x11-session-removal/), `services.desktopManager.pantheon` now defaults to pantheon-wayland session. The X11 session will be removed before gnome-session 49 lands. - Due to [deprecation of gnome-session X11 support](https://blogs.gnome.org/alatiera/2025/06/08/the-x11-session-removal/), `services.desktopManager.pantheon` now defaults to pantheon-wayland session. The X11 session has been removed, see [this issue](https://github.com/elementary/session-settings/issues/91) for details.
- `services.gitea` supports sending notifications with sendmail again. To do this, activate the parameter `services.gitea.mailerUseSendmail` and configure SMTP server. - `services.gitea` supports sending notifications with sendmail again. To do this, activate the parameter `services.gitea.mailerUseSendmail` and configure SMTP server.

20
nixos/tests/pantheon.nix
View File

@@ -75,11 +75,19 @@
machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
with subtest("Check if Pantheon components actually start"): with subtest("Check if Pantheon components actually start"):
# We specifically check gsd-xsettings here since it is manually pulled up by gala. pgrep_list = [
# https://github.com/elementary/gala/pull/2140 "${pkgs.pantheon.gala}/bin/gala",
for i in ["gala", "io.elementary.wingpanel", "io.elementary.dock", "gsd-media-keys", "gsd-xsettings", "io.elementary.desktop.agent-polkit"]: "io.elementary.wingpanel",
machine.wait_until_succeeds(f"pgrep -f {i}") "io.elementary.dock",
machine.wait_until_succeeds("pgrep -xf ${pkgs.pantheon.elementary-files}/libexec/io.elementary.files.xdg-desktop-portal") "${pkgs.pantheon.gnome-settings-daemon}/libexec/gsd-media-keys",
# We specifically check gsd-xsettings here since it is manually pulled up by gala.
# https://github.com/elementary/gala/pull/2140
"${pkgs.pantheon.gnome-settings-daemon}/libexec/gsd-xsettings",
"${pkgs.pantheon.pantheon-agent-polkit}/libexec/policykit-1-pantheon/io.elementary.desktop.agent-polkit",
"${pkgs.pantheon.elementary-files}/libexec/io.elementary.files.xdg-desktop-portal"
]
for i in pgrep_list:
machine.wait_until_succeeds(f"pgrep -xf {i}")
with subtest("Check if various environment variables are set"): with subtest("Check if various environment variables are set"):
cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf ${pkgs.pantheon.gala}/bin/gala)/environ" cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf ${pkgs.pantheon.gala}/bin/gala)/environ"
@@ -93,7 +101,7 @@
machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'") machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
with subtest("Wait for elementary videos autostart"): with subtest("Wait for elementary videos autostart"):
machine.wait_until_succeeds("pgrep -f io.elementary.videos") machine.wait_until_succeeds("pgrep -xf /run/current-system/sw/bin/io.elementary.videos")
machine.wait_for_text("No Videos Open") machine.wait_for_text("No Videos Open")
machine.screenshot("videos") machine.screenshot("videos")

6
pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
View File

@@ -58,8 +58,9 @@ stdenv.mkDerivation rec {
mesonFlags = [ mesonFlags = [
"-Dmimeapps-list=false" "-Dmimeapps-list=false"
"-Dfallback-session=GNOME"
"-Ddetect-program-prefixes=true" "-Ddetect-program-prefixes=true"
# https://github.com/elementary/session-settings/issues/91
"-Dx11=false"
"--sysconfdir=${placeholder "out"}/etc" "--sysconfdir=${placeholder "out"}/etc"
]; ];
@@ -70,7 +71,7 @@ stdenv.mkDerivation rec {
cp -av ${./pantheon-mimeapps.list} $out/share/applications/pantheon-mimeapps.list cp -av ${./pantheon-mimeapps.list} $out/share/applications/pantheon-mimeapps.list
# absolute path patched sessions # absolute path patched sessions
substituteInPlace $out/share/{xsessions/pantheon.desktop,wayland-sessions/pantheon-wayland.desktop} \ substituteInPlace $out/share/wayland-sessions/pantheon-wayland.desktop \
--replace-fail "Exec=gnome-session" "Exec=${gnome-session}/bin/gnome-session" \ --replace-fail "Exec=gnome-session" "Exec=${gnome-session}/bin/gnome-session" \
--replace-fail "TryExec=io.elementary.wingpanel" "TryExec=${wingpanel}/bin/io.elementary.wingpanel" --replace-fail "TryExec=io.elementary.wingpanel" "TryExec=${wingpanel}/bin/io.elementary.wingpanel"
''; '';
@@ -79,7 +80,6 @@ stdenv.mkDerivation rec {
updateScript = nix-update-script { }; updateScript = nix-update-script { };
providedSessions = [ providedSessions = [
"pantheon"
"pantheon-wayland" "pantheon-wayland"
]; ];
}; };