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

Merge pull request #301847 from bobby285271/upd/pantheon

Browse Source 
pantheon.gala: Fix missing URI handler
This commit is contained in:
Bobby Rong 2024-04-05 22:53:24 +08:00 committed by GitHub
commit 29f96f114b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -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 = "io.elementary.gala@.service";
After = "io.elementary.gala@.service";
};
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

2
nixos/tests/pantheon.nix
View File

@ -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 ["io.elementary.gala.daemon@x11.service", "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"):

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

@ -91,7 +91,7 @@ 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";
@ -99,8 +99,8 @@ stdenv.mkDerivation rec {
# 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 = [

11
pkgs/desktops/pantheon/desktop/gala/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pkg-config
, meson
@ -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 = [
@ -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 Wants=io.elementary.gala.daemon@.service' -i 'data/gala@x11.service.in'
'';
passthru = {