mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Merge pull request #301847 from bobby285271/upd/pantheon
pantheon.gala: Fix missing URI handler
This commit is contained in:
commit
29f96f114b
|
@ -190,22 +190,6 @@ in
|
||||||
"org.gnome.SettingsDaemon.XSettings.service"
|
"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
|
# Global environment
|
||||||
environment.systemPackages = (with pkgs.pantheon; [
|
environment.systemPackages = (with pkgs.pantheon; [
|
||||||
elementary-session-settings
|
elementary-session-settings
|
||||||
|
|
|
@ -50,7 +50,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
|
||||||
machine.wait_until_succeeds(f"pgrep -f {i}")
|
machine.wait_until_succeeds(f"pgrep -f {i}")
|
||||||
for i in ["gala", "io.elementary.wingpanel", "plank"]:
|
for i in ["gala", "io.elementary.wingpanel", "plank"]:
|
||||||
machine.wait_for_window(i)
|
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}")
|
machine.wait_for_unit(i, "${user.name}")
|
||||||
|
|
||||||
with subtest("Check if various environment variables are set"):
|
with subtest("Check if various environment variables are set"):
|
||||||
|
|
|
@ -91,7 +91,7 @@ in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "elementary-session-settings";
|
pname = "elementary-session-settings";
|
||||||
version = "6.0.0-unstable-2023-09-05";
|
version = "6.0.0-unstable-2024-03-29";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "elementary";
|
owner = "elementary";
|
||||||
|
@ -99,8 +99,8 @@ stdenv.mkDerivation rec {
|
||||||
# For systemd managed gnome-session support.
|
# For systemd managed gnome-session support.
|
||||||
# https://github.com/NixOS/nixpkgs/issues/228946
|
# https://github.com/NixOS/nixpkgs/issues/228946
|
||||||
# nixpkgs-update: no auto update
|
# nixpkgs-update: no auto update
|
||||||
rev = "3476c89bbb66564a72c6495ac0c61f8f9ed7a3ec";
|
rev = "53bf57e5b32936befc3003a0f99c5b3a69349c76";
|
||||||
sha256 = "sha256-Z1qW6m0XDkB92ZZVKx98JOMXiBDbGpQ0cAXgWdqK27c=";
|
sha256 = "sha256-TX9V6gZiuPEKSHQoSD4+5QptuqEvuErCJ8OF2KFRf9k=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, nix-update-script
|
, nix-update-script
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, meson
|
, meson
|
||||||
|
@ -39,6 +40,13 @@ stdenv.mkDerivation rec {
|
||||||
# We look for plugins in `/run/current-system/sw/lib/` because
|
# We look for plugins in `/run/current-system/sw/lib/` because
|
||||||
# there are multiple plugin providers (e.g. gala and wingpanel).
|
# there are multiple plugin providers (e.g. gala and wingpanel).
|
||||||
./plugins-dir.patch
|
./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 = [
|
nativeBuildInputs = [
|
||||||
|
@ -70,9 +78,6 @@ stdenv.mkDerivation rec {
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
chmod +x build-aux/meson/post_install.py
|
chmod +x build-aux/meson/post_install.py
|
||||||
patchShebangs 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 = {
|
passthru = {
|
||||||
|
|
Loading…
Reference in a new issue