Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pantheon.gala: Fix missing URI handler #301847

Merged
merged 2 commits into from
Apr 5, 2024
Merged

pantheon.gala: Fix missing URI handler #301847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd3f680
pantheon.gala: Backport Wayland menu commit
bobby285271 Apr 5, 2024
cf95976
pantheon.elementary-session-settings: 6.0.0-unstable-2023-09-05 -> 6.…
bobby285271 Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions nixos/modules/services/x11/desktop-managers/pantheon.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,22 +190,6 @@ in
"org.gnome.SettingsDaemon.XSettings.service"
];

# https://github.com/elementary/gala/issues/1826#issuecomment-1890461298
systemd.user.services."io.elementary.gala.daemon@" = {
unitConfig = {
Description = "Gala Daemon";
BindsTo = "[email protected]";
After = "[email protected]";
};

serviceConfig = {
Type = "dbus";
BusName = "org.pantheon.gala.daemon";
ExecStart = "${pkgs.pantheon.gala}/bin/gala-daemon";
Slice = "session.slice";
};
};

# Global environment
environment.systemPackages = (with pkgs.pantheon; [
elementary-session-settings
Expand Down
2 changes: 1 addition & 1 deletion nixos/tests/pantheon.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
machine.wait_until_succeeds(f"pgrep -f {i}")
for i in ["gala", "io.elementary.wingpanel", "plank"]:
machine.wait_for_window(i)
for i in ["[email protected]", "bamfdaemon.service", "io.elementary.files.xdg-desktop-portal.service"]:
for i in ["bamfdaemon.service", "io.elementary.files.xdg-desktop-portal.service"]:
machine.wait_for_unit(i, "${user.name}")

with subtest("Check if various environment variables are set"):
Expand Down
6 changes: 3 additions & 3 deletions pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,16 @@ in

stdenv.mkDerivation rec {
pname = "elementary-session-settings";
version = "6.0.0-unstable-2023-09-05";
version = "6.0.0-unstable-2024-03-29";

src = fetchFromGitHub {
owner = "elementary";
repo = "session-settings";
# For systemd managed gnome-session support.
# https://github.com/NixOS/nixpkgs/issues/228946
# nixpkgs-update: no auto update
rev = "3476c89bbb66564a72c6495ac0c61f8f9ed7a3ec";
sha256 = "sha256-Z1qW6m0XDkB92ZZVKx98JOMXiBDbGpQ0cAXgWdqK27c=";
rev = "53bf57e5b32936befc3003a0f99c5b3a69349c76";
sha256 = "sha256-TX9V6gZiuPEKSHQoSD4+5QptuqEvuErCJ8OF2KFRf9k=";
};

nativeBuildInputs = [
Expand Down
11 changes: 8 additions & 3 deletions pkgs/desktops/pantheon/desktop/gala/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pkg-config
, meson
Expand Down Expand Up @@ -39,6 +40,13 @@ stdenv.mkDerivation rec {
# We look for plugins in `/run/current-system/sw/lib/` because
# there are multiple plugin providers (e.g. gala and wingpanel).
./plugins-dir.patch

# Start gala-daemon internally (needed for systemd managed gnome-session)
# https://github.com/elementary/gala/pull/1844
(fetchpatch {
url = "https://github.com/elementary/gala/commit/351722c5a4fded46992b725e03dc94971c5bd31f.patch";
hash = "sha256-RvdVHQjCUNmLrROBZTF+m1vE2XudtQZjk/YW28P/vKc=";
})
];

nativeBuildInputs = [
Expand Down Expand Up @@ -70,9 +78,6 @@ stdenv.mkDerivation rec {
postPatch = ''
chmod +x build-aux/meson/post_install.py
patchShebangs build-aux/meson/post_install.py

# https://github.com/elementary/gala/issues/1826#issuecomment-1890461298
sed '2i [email protected]' -i 'data/[email protected]'
'';

passthru = {
Expand Down