From 344a5a731b138c2e3b701d5ac09a4fb6e1a8a8a1 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 5 Apr 2020 23:32:59 -0400 Subject: [PATCH 01/15] gnome3.mutter334: init Used for Pantheon --- ...tor-Preserve-valid-paint-volumes-til.patch | 147 ---------------- pkgs/desktops/gnome-3/core/mutter/3.28.nix | 97 ----------- .../3.34/0001-Fix-glitches-in-gala.patch | 29 ++++ .../gnome-3/core/mutter/3.34/default.nix | 159 ++++++++++++++++++ .../core/mutter/3.34/drop-inheritable.patch | 132 +++++++++++++++ .../fix-paths.patch} | 4 +- .../core/mutter/3.34/fix-sysprof.patch | 25 +++ .../gnome-3/core/mutter/libglvnd-328.patch | 63 ------- pkgs/desktops/gnome-3/default.nix | 9 +- 9 files changed, 352 insertions(+), 313 deletions(-) delete mode 100644 pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch delete mode 100644 pkgs/desktops/gnome-3/core/mutter/3.28.nix create mode 100644 pkgs/desktops/gnome-3/core/mutter/3.34/0001-Fix-glitches-in-gala.patch create mode 100644 pkgs/desktops/gnome-3/core/mutter/3.34/default.nix create mode 100644 pkgs/desktops/gnome-3/core/mutter/3.34/drop-inheritable.patch rename pkgs/desktops/gnome-3/core/mutter/{fix-paths-328.patch => 3.34/fix-paths.patch} (74%) create mode 100644 pkgs/desktops/gnome-3/core/mutter/3.34/fix-sysprof.patch delete mode 100644 pkgs/desktops/gnome-3/core/mutter/libglvnd-328.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch b/pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch deleted file mode 100644 index 0e1c33773b0..00000000000 --- a/pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 76477def5c103f10d62e604305802d7f5506afd4 Mon Sep 17 00:00:00 2001 -From: worldofpeace -Date: Sun, 15 Sep 2019 20:14:16 -0400 -Subject: [PATCH] Revert "ClutterActor: Preserve valid paint volumes till the - next relayout/repaint" - -This causes issues for users of mutter like in gala[0]. - -Upstream report: https://gitlab.gnome.org/GNOME/mutter/issues/536 -[0]: https://github.com/elementary/gala/issues/605 ---- - clutter/clutter/clutter-actor.c | 35 +++++---------------------------- - 1 file changed, 5 insertions(+), 30 deletions(-) - -diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c -index e70892308..8cb60fa07 100644 ---- a/clutter/clutter/clutter-actor.c -+++ b/clutter/clutter/clutter-actor.c -@@ -24,7 +24,7 @@ - - /** - * SECTION:clutter-actor -- * @short_description: The basic element of the scene graph -+ * @short_description: The basic element of the scene graph - * - * The ClutterActor class is the basic element of the scene graph in Clutter, - * and it encapsulates the position, size, and transformations of a node in -@@ -840,7 +840,6 @@ struct _ClutterActorPrivate - guint needs_compute_expand : 1; - guint needs_x_expand : 1; - guint needs_y_expand : 1; -- guint needs_paint_volume_update : 1; - guint had_effects_on_last_paint_volume_update : 1; - }; - -@@ -1511,8 +1510,6 @@ clutter_actor_real_map (ClutterActor *self) - - CLUTTER_ACTOR_SET_FLAGS (self, CLUTTER_ACTOR_MAPPED); - -- self->priv->needs_paint_volume_update = TRUE; -- - stage = _clutter_actor_get_stage_internal (self); - priv->pick_id = _clutter_stage_acquire_pick_id (CLUTTER_STAGE (stage), self); - -@@ -2746,7 +2743,6 @@ clutter_actor_real_queue_relayout (ClutterActor *self) - priv->needs_width_request = TRUE; - priv->needs_height_request = TRUE; - priv->needs_allocation = TRUE; -- priv->needs_paint_volume_update = TRUE; - - /* reset the cached size requests */ - memset (priv->width_requests, 0, -@@ -4742,7 +4738,7 @@ clutter_actor_set_rotation_center_internal (ClutterActor *self, - ClutterRotateAxis axis, - const ClutterVertex *center) - { -- ClutterVertex v = CLUTTER_VERTEX_INIT_ZERO; -+ ClutterVertex v = CLUTTER_VERTEX_INIT_ZERO; - GObject *obj = G_OBJECT (self); - ClutterTransformInfo *info; - -@@ -8531,7 +8527,6 @@ clutter_actor_init (ClutterActor *self) - priv->needs_width_request = TRUE; - priv->needs_height_request = TRUE; - priv->needs_allocation = TRUE; -- priv->needs_paint_volume_update = TRUE; - - priv->cached_width_age = 1; - priv->cached_height_age = 1; -@@ -10098,9 +10093,6 @@ clutter_actor_allocate (ClutterActor *self, - return; - } - -- if (CLUTTER_ACTOR_IS_MAPPED (self)) -- self->priv->needs_paint_volume_update = TRUE; -- - if (!stage_allocation_changed) - { - /* If the actor didn't move but needs_allocation is set, we just -@@ -12992,9 +12984,6 @@ clutter_actor_add_child_internal (ClutterActor *self, - child->priv->needs_height_request = TRUE; - child->priv->needs_allocation = TRUE; - -- if (CLUTTER_ACTOR_IS_MAPPED (child)) -- child->priv->needs_paint_volume_update = TRUE; -- - /* we only queue a relayout here, because any possible - * redraw has already been queued either by show() or - * by our call to queue_redraw() above -@@ -14130,7 +14119,7 @@ clutter_actor_get_anchor_point_gravity (ClutterActor *self) - * - * Since: 0.6 - * -- * Deprecated: 1.12: Use #ClutterActor:pivot-point and -+ * Deprecated: 1.12: Use #ClutterActor:pivot-point and - * clutter_actor_set_translation() instead. - */ - void -@@ -14178,7 +14167,7 @@ clutter_actor_move_anchor_point (ClutterActor *self, - * - * Since: 0.6 - * -- * Deprecated: 1.12: Use #ClutterActor:pivot-point and -+ * Deprecated: 1.12: Use #ClutterActor:pivot-point and - * clutter_actor_set_translation() instead. - */ - void -@@ -14230,7 +14219,7 @@ clutter_actor_move_anchor_point_from_gravity (ClutterActor *self, - * - * Since: 0.6 - * -- * Deprecated: 1.12: Use #ClutterActor:pivot-point and -+ * Deprecated: 1.12: Use #ClutterActor:pivot-point and - * clutter_actor_set_translation() instead. E.g. For %CLUTTER_GRAVITY_CENTER set - * pivot_point to (0.5,0.5) and the translation to (width/2,height/2). - */ -@@ -17567,19 +17556,6 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self) - - if (priv->paint_volume_valid) - { -- /* If effects are applied, the actor paint volume -- * needs to be recomputed on each paint, since those -- * paint volumes could change over the duration of the -- * effect. -- * -- * We also need to update the paint volume if we went -- * from having effects to not having effects on the last -- * paint volume update. */ -- if (!priv->needs_paint_volume_update && -- priv->current_effect == NULL && -- !has_paint_volume_override_effects && -- !priv->had_effects_on_last_paint_volume_update) -- return &priv->paint_volume; - clutter_paint_volume_free (&priv->paint_volume); - } - -@@ -17588,7 +17564,6 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self) - if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume)) - { - priv->paint_volume_valid = TRUE; -- priv->needs_paint_volume_update = FALSE; - return &priv->paint_volume; - } - else --- -2.22.1 - diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix deleted file mode 100644 index 85208163415..00000000000 --- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ fetchFromGitLab, stdenv, substituteAll, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo -, glib, gtk3, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3, fetchpatch -, gsettings-desktop-schemas, gnome-desktop, wrapGAppsHook -, libtool, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput -, geocode-glib, libgudev, libwacom, xwayland, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "mutter"; - version = "3.28.4"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = pname; - rev = "74e3126b77eb5f27c0ae3f53b0aff2d2eebc15af"; # patches of tip from gnome-3-28 branch - sha256 = "0gw1n1w3i040w5mv30kkg7g8a59ymjlc5yaklip0ngg8xv76g0zi"; - }; - - patches = [ - (substituteAll { - src = ./fix-paths-328.patch; - inherit zenity; - }) - - # https://bugzilla.redhat.com/show_bug.cgi?id=1700337 - # https://gitlab.gnome.org/GNOME/mutter/merge_requests/133 - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/mutter328/raw/fff28bebda02111b4c534952465ff967ba7efced/f/0070-clutter-Add-API-to-retrieve-the-physical-size-of-abs.patch"; - sha256 = "11xg0clrqwvssy2r6hv4iya8g87z2v5f47fimd2b4hha6ki3g1is"; - }) - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/mutter328/raw/fff28bebda02111b4c534952465ff967ba7efced/f/0071-backends-Add-MetaInputMapper.patch"; - sha256 = "1kcp42hg8sy1q21w5586gdgmi95nf36829kkfswbah61h6bkb518"; - }) - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/mutter328/raw/fff28bebda02111b4c534952465ff967ba7efced/f/0072-backends-Delegate-on-MetaInputMapper-for-unmapped-di.patch"; - sha256 = "0zf4yxhq5s3dnzmn15mx4yb978g27ij4vmq055my9p7xgh6h9ga8"; - }) - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/mutter328/raw/fff28bebda02111b4c534952465ff967ba7efced/f/0073-backends-Add-MetaInputMapper-method-to-lookup-device.patch"; - sha256 = "0dnb2hqx5in6x9ar6wnr1hy3bg2wdcl3wbdx4jn66c7bi7s1k5zd"; - }) - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/mutter328/raw/fff28bebda02111b4c534952465ff967ba7efced/f/0074-backends-Turn-builtin-touchscreen-on-off-together-wi.patch"; - sha256 = "17fvs7j5ws4sz6fkch93gjlik0nm4z426w4n348gyw5llh0r76pg"; - }) - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/mutter328/raw/fff28bebda02111b4c534952465ff967ba7efced/f/0075-backends-Update-to-new-output-setting-for-tablets-to.patch"; - sha256 = "141p3an83s042f67fw2fqmr79i5g634ndrbpd8cs47fd4wwiwpj5"; - }) - # https://gitlab.gnome.org/GNOME/mutter/merge_requests/670 - # Needed for gala redorder workspace - (fetchpatch { - url = "https://github.com/elementary/os-patches/commit/d636a44885c5be662997f8e19f7dcd26670b3219.patch"; - sha256 = "12pbxk6f39a09jxjam5a5hxl4whp3cifzpck2m7fpp0n98nc63qh"; - }) - # See patch commit message - ./0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch - # Fix build with libglvnd provided headers - ./libglvnd-328.patch - ]; - - configureFlags = [ - "--with-x" - "--enable-shape" - "--enable-sm" - "--enable-startup-notification" - "--enable-xsync" - "--enable-verbose-mode" - "--with-libcanberra" - "--with-xwayland-path=${xwayland}/bin/Xwayland" - "--enable-compile-warnings=maximum" - ]; - - propagatedBuildInputs = [ - # required for pkgconfig to detect mutter-clutter - libXtst - ]; - - nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool wrapGAppsHook ]; - - buildInputs = [ - glib gobject-introspection gtk3 gsettings-desktop-schemas upower - gnome-desktop cairo pango cogl clutter zenity libstartup_notification - geocode-glib libinput libgudev libwacom - libcanberra-gtk3 zenity xkeyboard_config libxkbfile - libxkbcommon - ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - }; -} diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0001-Fix-glitches-in-gala.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0001-Fix-glitches-in-gala.patch new file mode 100644 index 00000000000..7be00b33bba --- /dev/null +++ b/pkgs/desktops/gnome-3/core/mutter/3.34/0001-Fix-glitches-in-gala.patch @@ -0,0 +1,29 @@ +From e10186284103d3ad8e425980b096eac813cae631 Mon Sep 17 00:00:00 2001 +From: worldofpeace +Date: Sun, 5 Apr 2020 23:06:03 -0400 +Subject: [PATCH] Fix glitches in gala + +This fixes issues for users of mutter like in gala[0]. + +Upstream report: https://gitlab.gnome.org/GNOME/mutter/issues/536 +[0]: https://github.com/elementary/gala/issues/605 +--- + clutter/clutter/clutter-actor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c +index ecf9a597d..07b8b7155 100644 +--- a/clutter/clutter/clutter-actor.c ++++ b/clutter/clutter/clutter-actor.c +@@ -17831,7 +17831,7 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self) + if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume)) + { + priv->paint_volume_valid = TRUE; +- priv->needs_paint_volume_update = FALSE; ++ //priv->needs_paint_volume_update = FALSE; + return &priv->paint_volume; + } + else +-- +2.25.1 + diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix new file mode 100644 index 00000000000..51d3c4115d9 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix @@ -0,0 +1,159 @@ +{ fetchurl +, fetchpatch +, substituteAll +, stdenv +, pkgconfig +, gnome3 +, pantheon +, gettext +, gobject-introspection +, upower +, cairo +, pango +, cogl +, json-glib +, libstartup_notification +, zenity +, libcanberra-gtk3 +, ninja +, xkeyboard_config +, libxkbfile +, libxkbcommon +, libXtst +, libinput +, gsettings-desktop-schemas +, glib +, gtk3 +, gnome-desktop +, geocode-glib +, pipewire_0_2 +, libgudev +, libwacom +, xwayland +, meson +, gnome-settings-daemon +, xorgserver +, python3 +, wrapGAppsHook +, sysprof +, desktop-file-utils +, libcap_ng +, egl-wayland +}: + +stdenv.mkDerivation rec { + pname = "mutter"; + version = "3.34.4"; + + outputs = [ "out" "dev" "man" ]; + + src = fetchurl { + url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "18hbw98p4h3d4qz57415smwmfg72s9a0nk8mb04ds1gn2lsm2d01"; + }; + + mesonFlags = [ + "-Degl_device=true" + "-Dinstalled_tests=false" # TODO: enable these + "-Dwayland_eglstream=true" + "-Dxwayland-path=${xwayland}/bin/Xwayland" + ]; + + propagatedBuildInputs = [ + # required for pkgconfig to detect mutter-clutter + json-glib + libXtst + libcap_ng + ]; + + nativeBuildInputs = [ + desktop-file-utils + gettext + meson + ninja + pkgconfig + python3 + wrapGAppsHook + xorgserver # for cvt command + ]; + + buildInputs = [ + cairo + cogl + egl-wayland + geocode-glib + glib + gnome-desktop + gnome-settings-daemon + gobject-introspection + gsettings-desktop-schemas + gtk3 + libcanberra-gtk3 + libgudev + libinput + libstartup_notification + libwacom + libxkbcommon + libxkbfile + pango + pipewire_0_2 # TODO: backport pipewire 0.3 support + sysprof + upower + xkeyboard_config + xwayland + zenity + ]; + + patches = [ + # Fix build with libglvnd provided headers + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90.patch"; + sha256 = "0imy2j8af9477jliwdq4jc40yw1cifsjjf196gnmwxr9rkj0hbrd"; + }) + + # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking + # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 + ./drop-inheritable.patch + + # See commit message for details + ./0001-Fix-glitches-in-gala.patch + + # https://gitlab.gnome.org/GNOME/mutter/merge_requests/1094 + # https://gitlab.gnome.org/GNOME/mutter/merge_requests/957 + ./fix-sysprof.patch + + # profiler: track changes in GLib and Sysprof + # https://gitlab.gnome.org/GNOME/mutter/merge_requests/908 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/605171291993460f31d470a8143d6438d0c6169c.patch"; + sha256 = "10fxzj0lmic2sp57w26w3r0bv1szngjjs50p3ka22wr9pxqmzl7l"; + }) + + # Fixes https://github.com/elementary/wingpanel/issues/305 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/9d390ee49fb1f6300336e82ae94cc8061c6bae12.patch"; + sha256 = "12hmi07rvspwhp8h1y1vmcvmvbh8fihcrb07ja5g0qnh28ip5qfi"; + }) + + (substituteAll { + src = ./fix-paths.patch; + inherit zenity; + }) + ]; + + postPatch = '' + patchShebangs src/backends/native/gen-default-modes.py + ''; + + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" + ''; + + meta = with stdenv.lib; { + description = "A window manager for GNOME"; + homepage = "https://gitlab.gnome.org/GNOME/mutter"; + license = licenses.gpl2; + maintainers = pantheon.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/drop-inheritable.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/drop-inheritable.patch new file mode 100644 index 00000000000..0f60be3a121 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/mutter/3.34/drop-inheritable.patch @@ -0,0 +1,132 @@ +From e9c772e265b2293af031c79f4bbc99b5847dfe3c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= +Date: Sat, 19 Oct 2019 13:26:05 +0200 +Subject: [PATCH] drop inheritable + +Adapted from https://gitlab.gnome.org/GNOME/mutter/commit/c53c47ae123b03cc66044d2b846342123ecb3a01 + +We only want to drop inheritable though, to prevent the ambient set leaking further than gnome-shell. + +--- + config.h.meson | 3 +++ + meson.build | 5 +++++ + meson_options.txt | 6 ++++++ + src/core/main.c | 11 +++++++++++ + src/meson.build | 1 + + 5 files changed, 26 insertions(+) + +diff --git a/config.h.meson b/config.h.meson +index 0bab71848..202fb7ed1 100644 +--- a/config.h.meson ++++ b/config.h.meson +@@ -58,6 +58,9 @@ + /* Xwayland applications allowed to issue keyboard grabs */ + #mesondefine XWAYLAND_GRAB_DEFAULT_ACCESS_RULES + ++/* Defined if libcap-ng is available */ ++#mesondefine HAVE_LIBCAPNG ++ + /* XKB base prefix */ + #mesondefine XKB_BASE + +diff --git a/meson.build b/meson.build +index 3322bd3b1..01c8020fa 100644 +--- a/meson.build ++++ b/meson.build +@@ -35,6 +35,7 @@ libstartup_notification_req = '>= 0.7' + libcanberra_req = '>= 0.26' + libwacom_req = '>= 0.13' + atk_req = '>= 2.5.3' ++libcapng_req = '>= 0.7.9' + + # optional version requirements + udev_req = '>= 228' +@@ -125,6 +126,7 @@ xau_dep = dependency('xau') + ice_dep = dependency('ice') + atk_dep = dependency('atk', version: atk_req) + libcanberra_dep = dependency('libcanberra', version: libcanberra_req) ++libcapng_dep = dependency('libcap-ng', required: get_option('libcapng')) + + # For now always require X11 support + have_x11 = true +@@ -256,6 +258,7 @@ have_core_tests = false + have_cogl_tests = false + have_clutter_tests = false + have_installed_tests = false ++have_libcapng = libcapng_dep.found() + + if have_tests + have_core_tests = get_option('core_tests') +@@ -361,6 +364,7 @@ cdata.set('HAVE_LIBWACOM', have_libwacom) + cdata.set('HAVE_SM', have_sm) + cdata.set('HAVE_STARTUP_NOTIFICATION', have_startup_notification) + cdata.set('HAVE_INTROSPECTION', have_introspection) ++cdata.set('HAVE_LIBCAPNG', have_libcapng) + cdata.set('HAVE_PROFILER', have_profiler) + + xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base') +@@ -443,6 +447,7 @@ output = [ + ' Startup notification..... ' + have_startup_notification.to_string(), + ' Introspection............ ' + have_introspection.to_string(), + ' Profiler................. ' + have_profiler.to_string(), ++ ' libcap-ng................ ' + have_libcapng.to_string(), + '', + ' Tests:', + '', +diff --git a/meson_options.txt b/meson_options.txt +index 73aa7adde..8bfaacd9a 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -152,3 +152,9 @@ option('xwayland_grab_default_access_rules', + value: 'gnome-boxes,remote-viewer,virt-viewer,virt-manager,vinagre,vncviewer,Xephyr', + description: 'Comma delimited list of applications ressources or class allowed to issue X11 grabs in Xwayland' + ) ++ ++option('libcapng', ++ type: 'feature', ++ value: 'auto', ++ description: 'Enable libcap-ng support' ++) +diff --git a/src/core/main.c b/src/core/main.c +index 7f4f666d2..b27968f13 100644 +--- a/src/core/main.c ++++ b/src/core/main.c +@@ -66,6 +66,10 @@ + #include + #endif + ++#ifdef HAVE_LIBCAPNG ++#include ++#endif ++ + #if defined(HAVE_NATIVE_BACKEND) && defined(HAVE_WAYLAND) + #include + #endif /* HAVE_WAYLAND && HAVE_NATIVE_BACKEND */ +@@ -673,6 +677,12 @@ meta_run (void) + if (!meta_display_open ()) + meta_exit (META_EXIT_ERROR); + ++#ifdef HAVE_LIBCAPNG ++ capng_clear(CAPNG_SELECT_BOTH); ++ capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_NICE); ++ capng_apply(CAPNG_SELECT_BOTH); ++#endif ++ + g_main_loop_run (meta_main_loop); + + meta_finalize (); +diff --git a/src/meson.build b/src/meson.build +index 90d80734f..a9fffa2c2 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -18,6 +18,7 @@ mutter_pkg_deps = [ + glib_dep, + gsettings_desktop_schemas_dep, + gtk3_dep, ++ libcapng_dep, + pango_dep, + ] + +-- +2.23.0 + diff --git a/pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/fix-paths.patch similarity index 74% rename from pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch rename to pkgs/desktops/gnome-3/core/mutter/3.34/fix-paths.patch index 6c40624a55d..1986c65e8f4 100644 --- a/pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch +++ b/pkgs/desktops/gnome-3/core/mutter/3.34/fix-paths.patch @@ -1,8 +1,8 @@ diff --git a/src/core/util.c b/src/core/util.c -index 5b8de18c7..546352a95 100644 +index 57b73747d..f424cc81c 100644 --- a/src/core/util.c +++ b/src/core/util.c -@@ -635,7 +635,7 @@ meta_show_dialog (const char *type, +@@ -636,7 +636,7 @@ meta_show_dialog (const char *type, args = g_ptr_array_new (); diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/fix-sysprof.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/fix-sysprof.patch new file mode 100644 index 00000000000..481a0ab89cb --- /dev/null +++ b/pkgs/desktops/gnome-3/core/mutter/3.34/fix-sysprof.patch @@ -0,0 +1,25 @@ +From 71acfd5258b4d12323fc51dda48e83830e62e696 Mon Sep 17 00:00:00 2001 +From: worldofpeace +Date: Mon, 16 Sep 2019 11:18:27 -0400 +Subject: [PATCH] build: use get_pkgconfig_variable for sysprof dbusdir + +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 182f7f5f5..43060865b 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -710,7 +710,7 @@ if have_profiler + 'backends/meta-profiler.h', + ] + +- dbus_interfaces_dir = join_paths(datadir, 'dbus-1', 'interfaces') ++ dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('prefix'), 'share', 'dbus-1', 'interfaces') + sysprof3_dbus_file = join_paths(dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml') + + dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler', +-- +2.22.1 + diff --git a/pkgs/desktops/gnome-3/core/mutter/libglvnd-328.patch b/pkgs/desktops/gnome-3/core/mutter/libglvnd-328.patch deleted file mode 100644 index 96e27559828..00000000000 --- a/pkgs/desktops/gnome-3/core/mutter/libglvnd-328.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/cogl/configure.ac b/cogl/configure.ac -index 3be282f..d338cd1 100644 ---- a/cogl/configure.ac -+++ b/cogl/configure.ac -@@ -490,6 +490,11 @@ AS_IF([test "x$enable_gles1" = "xyes"], - #include "], - [], - [$COGL_EGL_INCLUDES]) -+ AC_CHECK_HEADERS([EGL/eglmesaext.h], -+ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE -+#include "], -+ [], -+ [$COGL_EGL_INCLUDES]) - - # Check for a GLES 1.x Common Profile library with/without EGL. - # -@@ -759,7 +764,9 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], - ) - - COGL_EGL_INCLUDES="#include --#include " -+#include -+#include -+" - AC_SUBST([COGL_EGL_INCLUDES]) - ]) - -diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h -index 8705e7d..db0b74f 100644 ---- a/src/backends/meta-egl-ext.h -+++ b/src/backends/meta-egl-ext.h -@@ -29,6 +29,7 @@ - - #include - #include -+#include - - /* - * This is a little different to the tests shipped with EGL implementations, -diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c -index 755ec49..bd253c9 100644 ---- a/src/backends/meta-egl.c -+++ b/src/backends/meta-egl.c -@@ -31,6 +31,7 @@ - - #include - #include -+#include - #include - #include - #include -diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h -index 060c7cd..2fef264 100644 ---- a/src/backends/meta-egl.h -+++ b/src/backends/meta-egl.h -@@ -27,6 +27,7 @@ - - #include - #include -+#include - #include - - #define META_EGL_ERROR meta_egl_error_quark () diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 4fdaa42a1bf..25a8ba6573a 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -107,10 +107,9 @@ lib.makeScope pkgs.newScope (self: with self; { mutter = callPackage ./core/mutter { }; - # Needed for elementary's gala and greeter until they get around to adapting to all the API breaking changes in libmutter-3 - # A more detailed explaination can be seen here https://decathorpe.com/2018/09/04/call-for-help-pantheon-on-fedora-29.html - # See Also: https://github.com/elementary/gala/issues/303 - mutter328 = callPackage ./core/mutter/3.28.nix { }; + # Needed for elementary's gala and greeter until 3.36 support has more bugfixes + # https://github.com/elementary/gala/issues/763 + mutter334 = callPackage ./core/mutter/3.34 { }; nautilus = callPackage ./core/nautilus { }; @@ -358,4 +357,6 @@ lib.makeScope pkgs.newScope (self: with self; { vino = throw "vino is deprecated, use gnome-remote-desktop instead."; # added 2020-03-13 gnome-screensaver = throw "gnome-screensaver is deprecated. If you are using GNOME Flashback, it now has a built-in lock screen. If you are using it elsewhere, you can try xscreenlock or other alternatives."; # added 2020-03-19 + + mutter328 = throw "Removed as Pantheon is upgraded to mutter334."; }) From 20feca41fde730a9e726732483b0577f7cb30ffb Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 5 Apr 2020 23:35:32 -0400 Subject: [PATCH 02/15] pantheon.mutter: 328 -> 334 --- pkgs/desktops/pantheon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index b545a69e424..8e8e5fc6318 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -29,7 +29,7 @@ lib.makeScope pkgs.newScope (self: with self; { maintainers = with pkgs.stdenv.lib.maintainers; [ worldofpeace ]; - mutter = pkgs.gnome3.mutter328; + mutter = pkgs.gnome3.mutter334; elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; From 548d7eaa8b2b78f4811488ba462bfbde8f7e6136 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 10 Nov 2019 21:12:18 -0500 Subject: [PATCH 03/15] pantheon.elementary-gsettings-schemas: add gala override --- .../pantheon/desktop/elementary-gsettings-schemas/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index 38e57539de4..2580907a592 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -36,7 +36,8 @@ runCommand "elementary-gsettings-desktop-schemas" {} schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas mkdir -p $schema_dir - cp -rf ${glib.getSchemaPath gsettings-desktop-schemas}/*.xml $schema_dir + + cp -rf ${glib.getSchemaPath gala}/*.gschema.override $schema_dir ${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml $schema_dir\n") gsettingsOverridePackages} From a1ced50fa01ba7edbab4742d12e24f1dca465c56 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 7 Dec 2019 20:04:58 -0500 Subject: [PATCH 04/15] pantheon.elementary-settings-daemon: 3.30.2 -> 3.34.1 --- pkgs/desktops/pantheon/default.nix | 4 +- .../elementary-settings-daemon/default.nix | 198 +++++++++--------- .../elementary-dpms.patch | 84 ++++++++ .../fix-paths.patch | 11 - .../global-backlight-helper.patch | 30 +-- 5 files changed, 198 insertions(+), 129 deletions(-) create mode 100644 pkgs/desktops/pantheon/services/elementary-settings-daemon/elementary-dpms.patch diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 8e8e5fc6318..2bcbbf40d94 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -110,7 +110,9 @@ lib.makeScope pkgs.newScope (self: with self; { # We're using ubuntu and elementary's patchset due to reasons # explained here -> https://github.com/elementary/greeter/issues/92#issuecomment-376215614 # Take note of "I am holding off on "fixing" this bug for as long as possible." - elementary-settings-daemon = callPackage ./services/elementary-settings-daemon { }; + elementary-settings-daemon = callPackage ./services/elementary-settings-daemon { + inherit (gnome3) gnome-desktop; + }; pantheon-agent-geoclue2 = callPackage ./services/pantheon-agent-geoclue2 { }; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 582793ff590..e5aa31ca0fb 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -1,87 +1,128 @@ -{ accountsservice -, alsaLib -, colord -, docbook_xsl -, fetchgit -, fetchurl -, geoclue2 -, geocode-glib -, gettext -, glib -, gnome3 -, gsettings-desktop-schemas -, gtk3 -, lcms2 -, libcanberra-gtk3 -, libgnomekbd -, libgudev -, libgweather -, libnotify -, libpulseaudio -, libwacom -, libxml2 -, libxslt -, meson -, mousetweaks -, networkmanager -, ninja -, nss -, pantheon -, perl -, pkgconfig -, polkit -, python3 -, stdenv +{ stdenv , substituteAll -, systemd -, tzdata +, fetchurl +, fetchgit +, meson +, ninja +, pkgconfig +, gnome3 +, perl +, gettext +, gtk3 +, glib +, libnotify +, libgnomekbd +, lcms2 +, libpulseaudio +, alsaLib +, libcanberra-gtk3 , upower -, libXtst +, colord +, libgweather +, polkit +, gsettings-desktop-schemas +, geoclue2 +, systemd +, libgudev +, libwacom +, libxslt +, libxml2 +, modemmanager +, networkmanager +, gnome-desktop +, geocode-glib +, docbook_xsl +, accountsservice , wrapGAppsHook +, python3 +, tzdata +, nss +, gcr +, pantheon }: stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; - version = "3.30.2"; + version = "3.34.1"; repoName = "gnome-settings-daemon"; - src = fetchurl { - url = "mirror://gnome/sources/${repoName}/${stdenv.lib.versions.majorMinor version}/${repoName}-${version}.tar.xz"; - sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12"; - }; - - # Source for ubuntu's patchset - src2 = fetchgit { + src = fetchgit { url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${repoName}"; - rev = "refs/tags/ubuntu/${version}-1ubuntu1"; - sha256 = "02awkhw6jqm7yh812mw0nsdmsljfi8ksz8mvd2qpns5pcv002g2c"; + rev = "refs/tags/ubuntu/${version}-1ubuntu2"; + sha256 = "0w0dsbzif7v0gk61rs9g20ldlimbdwb5yvlfdc568yyx5z643jbv"; }; # We've omitted the 53_sync_input_sources_to_accountsservice patch because it breaks the build. # See: https://gist.github.com/worldofpeace/2f152a20b7c47895bb93239fce1c9f52 # # Also omit ubuntu_calculator_snap.patch as that's obviously not useful here. - patches = let patchPath = "${src2}/debian/patches"; in [ + patches = let patchPath = "${src}/debian/patches"; in [ (substituteAll { src = ./fix-paths.patch; - inherit tzdata mousetweaks; + inherit tzdata; }) ./global-backlight-helper.patch "${patchPath}/45_suppress-printer-may-not-be-connected-notification.patch" + #"${patchPath}/53_sync_input_sources_to_accountsservice.patch" "${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch" "${patchPath}/correct_logout_action.patch" "${patchPath}/ubuntu-lid-close-suspend.patch" - "${patchPath}/revert-wacom-migration.patch" "${patchPath}/revert-gsettings-removals.patch" "${patchPath}/revert-mediakeys-dbus-interface-drop.patch" - "${patchPath}/ubuntu_ibus_configs.patch" - (fetchurl { - url = "https://github.com/elementary/os-patches/raw/6975d1c254cb6ab913b8e2396877203aea8eaa65/debian/patches/elementary-dpms.patch"; - sha256 = "0kh508ppiv4nvkg30gmw85cljlfq1bvkzhvf1iaxw0snb0mwgsxi"; - }) + #"${patchPath}/ubuntu_ibus_configs.patch" + # https://github.com/elementary/os-patches/blob/6975d1c254cb6ab913b8e2396877203aea8eaa65/debian/patches/elementary-dpms.patch + ./elementary-dpms.patch ]; + nativeBuildInputs = [ + meson + ninja + pkgconfig + perl + gettext + libxml2 + libxslt + docbook_xsl + wrapGAppsHook + python3 + ]; + + buildInputs = [ + accountsservice + alsaLib + colord + gcr + geoclue2 + geocode-glib + glib + gnome-desktop + gsettings-desktop-schemas + gtk3 + lcms2 + libcanberra-gtk3 + libgnomekbd # for org.gnome.libgnomekbd.keyboard schema + libgudev + libgweather + libnotify + libpulseaudio + libwacom + modemmanager + networkmanager + nss + polkit + systemd + upower + ]; + + mesonFlags = [ + "-Dudev_dir=${placeholder "out"}/lib/udev" + ]; + + # Default for release buildtype but passed manually because + # we're using plain + NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; + postPatch = '' for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do chmod +x $f @@ -105,53 +146,6 @@ stdenv.mkDerivation rec { ln -s $out/libexec/gsd-backlight-helper $out/bin/elementary-settings-daemon/gsd-backlight-helper ''; - nativeBuildInputs = [ - docbook_xsl - gettext - libxml2 - libxslt - meson - ninja - perl - pkgconfig - python3 - wrapGAppsHook - ]; - - buildInputs = [ - accountsservice - alsaLib - colord - geoclue2 - geocode-glib - glib - gnome3.gnome-desktop - gsettings-desktop-schemas - gtk3 - lcms2 - libXtst - libcanberra-gtk3 - libgnomekbd # for org.gnome.libgnomekbd.keyboard schema - libgudev - libgweather - libnotify - libpulseaudio - libwacom - networkmanager - nss - polkit - systemd - upower - ]; - - mesonFlags = [ - "-Dudev_dir=${placeholder "out"}/lib/udev" - ]; - - # Default for release buildtype but passed manually because - # we're using plain - NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; - passthru = { updateScript = gnome3.updateScript { packageName = repoName; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/elementary-dpms.patch b/pkgs/desktops/pantheon/services/elementary-settings-daemon/elementary-dpms.patch new file mode 100644 index 00000000000..14d056ceca2 --- /dev/null +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/elementary-dpms.patch @@ -0,0 +1,84 @@ +diff --git a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in +index ec805d8a..cf0d6793 100644 +--- a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in ++++ b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in +@@ -11,6 +11,11 @@ + Activation of this plugin + Whether this plugin would be activated by unity-settings-daemon or not + ++ ++ false ++ Reset X DPMS values ++ Whether DPMS values will be adjusted by gnome-settings-daemon ++ + + 30 + The brightness of the screen when idle +diff --git a/plugins/power/gpm-common.c b/plugins/power/gpm-common.c +index a7ca87fb..a56a7cdc 100644 +--- a/plugins/power/gpm-common.c ++++ b/plugins/power/gpm-common.c +@@ -280,6 +280,18 @@ disable_builtin_screensaver (gpointer unused) + return TRUE; + } + ++gboolean ++manage_dpms (void) ++{ ++ GSettings *settings; ++ gboolean manage_dpms_defaults; ++ ++ settings = g_settings_new ("org.gnome.settings-daemon.plugins.power"); ++ manage_dpms_defaults = g_settings_get_boolean (settings, "manage-dpms-defaults"); ++ g_object_unref (settings); ++ return manage_dpms_defaults; ++} ++ + guint + gsd_power_enable_screensaver_watchdog (void) + { +@@ -290,7 +302,7 @@ gsd_power_enable_screensaver_watchdog (void) + * way. The defaults are now applied in Fedora 20 from + * being "0" by default to being "600" by default */ + gdk_x11_display_error_trap_push (gdk_display_get_default ()); +- if (DPMSQueryExtension(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &dummy, &dummy)) ++ if (manage_dpms () && DPMSQueryExtension(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &dummy, &dummy)) + DPMSSetTimeouts (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), 0, 0, 0); + gdk_x11_display_error_trap_pop_ignored (gdk_display_get_default ()); + id = g_timeout_add_seconds (XSCREENSAVER_WATCHDOG_TIMEOUT, +diff --git a/plugins/power/gpm-common.h b/plugins/power/gpm-common.h +index 88a8e00e..af106479 100644 +--- a/plugins/power/gpm-common.h ++++ b/plugins/power/gpm-common.h +@@ -34,6 +34,7 @@ gchar *gpm_get_timestring (guint time); + gboolean gsd_power_is_hardware_a_vm (void); + guint gsd_power_enable_screensaver_watchdog (void); + void reset_idletime (void); ++gboolean manage_dpms (void); + + /* Backlight helpers */ + +diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c +index c500fa38..445496ee 100644 +--- a/plugins/power/gsd-power-manager.c ++++ b/plugins/power/gsd-power-manager.c +@@ -1033,6 +1033,9 @@ backlight_enable (GsdPowerManager *manager) + gboolean ret; + GError *error = NULL; + ++ if (!(manage_dpms ())) ++ return; ++ + iio_proxy_claim_light (manager, TRUE); + ret = gnome_rr_screen_set_dpms_mode (manager->rr_screen, + GNOME_RR_DPMS_ON, +@@ -1052,6 +1055,9 @@ backlight_disable (GsdPowerManager *manager) + gboolean ret; + GError *error = NULL; + ++ if (!(manage_dpms ())) ++ return; ++ + iio_proxy_claim_light (manager, FALSE); + ret = gnome_rr_screen_set_dpms_mode (manager->rr_screen, + GNOME_RR_DPMS_OFF, diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch b/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch index 272656fae78..2229302cab7 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch @@ -13,14 +13,3 @@ typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; ---- a/plugins/mouse/gsd-mouse-manager.c -+++ b/plugins/mouse/gsd-mouse-manager.c -@@ -118,7 +118,7 @@ set_mousetweaks_daemon (GsdMouseManager *manager, - gboolean run_daemon = dwell_click_enabled || secondary_click_enabled; - - if (run_daemon || manager->priv->mousetweaks_daemon_running) -- comm = g_strdup_printf ("mousetweaks %s", -+ comm = g_strdup_printf ("@mousetweaks@/bin/mousetweaks %s", - run_daemon ? "" : "-s"); - else - return; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch b/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch index c073b23e6b9..dcdc83934ba 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch @@ -1,18 +1,18 @@ -diff --git a/plugins/power/gpm-common.c b/plugins/power/gpm-common.c -index e83f1549..15890053 100644 ---- a/plugins/power/gpm-common.c -+++ b/plugins/power/gpm-common.c -@@ -452,7 +452,7 @@ run_backlight_helper (enum BacklightHelperCommand command, - gchar *argv[5] = { 0 }; - - argv[0] = "pkexec"; -- argv[1] = LIBEXECDIR "/gsd-backlight-helper"; -+ argv[1] = "/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper"; - argv[2] = helper_args[command]; - argv[3] = value; - +diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c +index d7d10fd2..5619d6ad 100644 +--- a/plugins/power/gsd-backlight.c ++++ b/plugins/power/gsd-backlight.c +@@ -358,7 +358,7 @@ gsd_backlight_run_set_helper (GsdBacklight *backlight, GTask *task) + proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE, + &error, + "pkexec", +- LIBEXECDIR "/gsd-backlight-helper", ++ "/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper", + g_udev_device_get_sysfs_path (backlight->udev_device), + data->value_str, NULL); + } else { diff --git a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in -index f16300f8..f19bba3e 100644 +index f16300f8..79d6bd17 100644 --- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in +++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in @@ -25,7 +25,7 @@ @@ -22,5 +22,5 @@ index f16300f8..f19bba3e 100644 - @libexecdir@/gsd-backlight-helper + /run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper - + From b0f0003c6e2dc227fca3c4ab97464609910c51bf Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 28 Mar 2020 20:58:15 -0400 Subject: [PATCH 05/15] pantheon.elementary-notifications: init at 2020-04-04 --- pkgs/desktops/pantheon/default.nix | 2 + .../elementary-notifications/default.nix | 60 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 pkgs/desktops/pantheon/services/elementary-notifications/default.nix diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 2bcbbf40d94..edcda887754 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -107,6 +107,8 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-dpms-helper = callPackage ./services/elementary-dpms-helper { }; + elementary-notifications = callPackage ./services/elementary-notifications { }; + # We're using ubuntu and elementary's patchset due to reasons # explained here -> https://github.com/elementary/greeter/issues/92#issuecomment-376215614 # Take note of "I am holding off on "fixing" this bug for as long as possible." diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix new file mode 100644 index 00000000000..b90f8c86bf1 --- /dev/null +++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix @@ -0,0 +1,60 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, vala +, gtk3 +, glib +, granite +, libgee +, libcanberra-gtk3 +, pantheon +, python3 +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "elementary-notifications"; + version = "unstable-2020-03-31"; + + repoName = "notifications"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = repoName; + rev = "db552b0c3466ba1099c7737c353b7225ab1896cc"; + sha256 = "1fhf4zx73qka935x5afv6zqsm2l37d1mjbhrbzzzz44dqwa2vp16"; + }; + + nativeBuildInputs = [ + glib # for glib-compile-schemas + meson + ninja + pkg-config + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + glib + granite + gtk3 + libcanberra-gtk3 + libgee + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "GTK notification server for Pantheon"; + homepage = "https://github.com/elementary/notifications"; + license = licenses.gpl3Plus; + maintainers = pantheon.maintainers; + platforms = platforms.linux; + }; +} From 50fe769887388c78c6084678e02f146d9ec9a3a4 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 31 Mar 2020 22:19:56 -0400 Subject: [PATCH 06/15] nixos/pantheon: use new notifications We have this bug https://github.com/elementary/gala/issues/636 when using notifications in gala. It's likely to not really be fixed because all development is on the new notifications server. --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 + .../desktop/elementary-default-settings/default.nix | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 9782b950dad..01fe230b8a4 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -208,6 +208,7 @@ in # Services elementary-capnet-assist elementary-dpms-helper + elementary-notifications elementary-settings-daemon pantheon-agent-geoclue2 pantheon-agent-polkit diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index be97c5903eb..bf93bbd0d29 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -10,6 +10,7 @@ , polkit , accountsservice , python3 +, fetchpatch }: stdenv.mkDerivation rec { @@ -32,6 +33,12 @@ stdenv.mkDerivation rec { }; patches = [ + # Use new notifications + (fetchpatch { + url = "https://github.com/elementary/default-settings/commit/0658bb75b9f49f58b35746d05fb6c4b811f125e9.patch"; + sha256 = "0wa7iq0vfp2av5v23w94a5844ddj4g48d4wk3yrp745dyrimg739"; + }) + # https://github.com/elementary/default-settings/pull/119 ./0001-Build-with-Meson.patch ]; From 741313d01ba48336195c6108da4b9302b20ec748 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 30 Mar 2020 02:36:18 -0400 Subject: [PATCH 07/15] pantheon.elementary-session-settings: 5.0.3 -> 2019-11-12 So we can drop the meson.patch intree. --- .../elementary-session-settings/default.nix | 10 +- .../elementary-session-settings/meson.patch | 272 ------------------ 2 files changed, 3 insertions(+), 279 deletions(-) delete mode 100644 pkgs/desktops/pantheon/desktop/elementary-session-settings/meson.patch diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index 58acdd12147..ffe1ea4714d 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -69,21 +69,17 @@ in stdenv.mkDerivation rec { pname = "elementary-session-settings"; - version = "5.0.3"; + version = "unstable-2019-11-12"; repoName = "session-settings"; src = fetchFromGitHub { owner = "elementary"; repo = repoName; - rev = version; - sha256 = "1vrjm7bklkfv0dyafm312v4hxzy6lb7p1ny4ijkn48kr719gc71k"; + rev = "f9d5afed16ce447cf6ae3c2d1c1db5eece84daca"; + sha256 = "0n1m41aapr58rb1ffvfkjq6c6w3f0ynjzzhja50s4di98p4m7y0q"; }; - postPatch = '' - ${git}/bin/git apply --verbose ${./meson.patch} - ''; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/meson.patch b/pkgs/desktops/pantheon/desktop/elementary-session-settings/meson.patch deleted file mode 100644 index 39d15565661..00000000000 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/meson.patch +++ /dev/null @@ -1,272 +0,0 @@ -From 0a20ad6a31c74f4f96e9ed3613ec6c16a94ede39 Mon Sep 17 00:00:00 2001 -From: worldofpeace -Date: Thu, 8 Aug 2019 11:25:37 -0400 -Subject: [PATCH] Build with Meson (#13) - ---- - applications/meson.build | 4 ++++ - ...ettingsDaemon.A11ySettings-pantheon.desktop | 0 - ...e.SettingsDaemon.Clipboard-pantheon.desktop | 0 - ...gnome.SettingsDaemon.Color-pantheon.desktop | 0 - ...me.SettingsDaemon.Datetime-pantheon.desktop | 0 - ...ettingsDaemon.Housekeeping-pantheon.desktop | 0 - ...me.SettingsDaemon.Keyboard-pantheon.desktop | 0 - ...e.SettingsDaemon.MediaKeys-pantheon.desktop | 0 - ...gnome.SettingsDaemon.Mouse-pantheon.desktop | 0 - ...gnome.SettingsDaemon.Power-pantheon.desktop | 0 - ...sDaemon.PrintNotifications-pantheon.desktop | 0 - ...nome.SettingsDaemon.Rfkill-pantheon.desktop | 0 - ...ome.SettingsDaemon.Sharing-pantheon.desktop | 0 - ...e.SettingsDaemon.Smartcard-pantheon.desktop | 0 - ...gnome.SettingsDaemon.Sound-pantheon.desktop | 0 - ...gnome.SettingsDaemon.Wacom-pantheon.desktop | 0 - ...e.SettingsDaemon.XSettings-pantheon.desktop | 0 - autostart/meson.build | 18 ++++++++++++++++++ - .../gnome-keyring-gpg-pantheon.desktop | 0 - .../gnome-keyring-pkcs11-pantheon.desktop | 0 - .../gnome-keyring-secrets-pantheon.desktop | 0 - .../gnome-keyring-ssh-pantheon.desktop | 0 - .../onboard-autostart-pantheon.desktop | 0 - .../orca-autostart-pantheon.desktop | 0 - .../user-dirs-update-gtk-pantheon.desktop | 0 - gnome-session/meson.build | 11 +++++++++++ - .../{pantheon.session => pantheon.session.in} | 2 +- - meson.build | 14 ++++++++++++++ - meson_options.txt | 11 +++++++++++ - xsessions/meson.build | 4 ++++ - 30 files changed, 63 insertions(+), 1 deletion(-) - create mode 100644 applications/meson.build - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.A11ySettings-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Clipboard-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Color-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Datetime-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Housekeeping-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Keyboard-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.MediaKeys-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Mouse-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Power-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.PrintNotifications-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Rfkill-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Sharing-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Smartcard-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Sound-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Wacom-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.XSettings-pantheon.desktop (100%) - create mode 100644 autostart/meson.build - rename autostart/{ => ubuntu}/gnome-keyring-gpg-pantheon.desktop (100%) - rename autostart/{ => ubuntu}/gnome-keyring-pkcs11-pantheon.desktop (100%) - rename autostart/{ => ubuntu}/gnome-keyring-secrets-pantheon.desktop (100%) - rename autostart/{ => ubuntu}/gnome-keyring-ssh-pantheon.desktop (100%) - rename autostart/{ => ubuntu}/onboard-autostart-pantheon.desktop (100%) - rename autostart/{ => ubuntu}/orca-autostart-pantheon.desktop (100%) - rename autostart/{ => ubuntu}/user-dirs-update-gtk-pantheon.desktop (100%) - create mode 100644 gnome-session/meson.build - rename gnome-session/{pantheon.session => pantheon.session.in} (94%) - create mode 100644 meson.build - create mode 100644 meson_options.txt - create mode 100644 xsessions/meson.build - -diff --git a/applications/meson.build b/applications/meson.build -new file mode 100644 -index 0000000..d03b92b ---- /dev/null -+++ b/applications/meson.build -@@ -0,0 +1,4 @@ -+install_data( -+ 'defaults.list', -+ install_dir: join_paths(datadir, 'applications') -+) -diff --git a/autostart/org.gnome.SettingsDaemon.A11ySettings-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.A11ySettings-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.A11ySettings-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.A11ySettings-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Clipboard-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Clipboard-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Clipboard-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Clipboard-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Color-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Color-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Color-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Color-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Datetime-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Datetime-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Datetime-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Datetime-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Housekeeping-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Housekeeping-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Housekeeping-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Housekeeping-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Keyboard-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Keyboard-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Keyboard-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Keyboard-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.MediaKeys-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.MediaKeys-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.MediaKeys-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.MediaKeys-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Mouse-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Mouse-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Mouse-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Mouse-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Power-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Power-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Power-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Power-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.PrintNotifications-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.PrintNotifications-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.PrintNotifications-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.PrintNotifications-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Rfkill-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Rfkill-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Rfkill-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Rfkill-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Sharing-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Sharing-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Sharing-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Sharing-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Smartcard-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Smartcard-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Smartcard-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Smartcard-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Sound-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Sound-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Sound-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Sound-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Wacom-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Wacom-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Wacom-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Wacom-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.XSettings-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.XSettings-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.XSettings-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.XSettings-pantheon.desktop -diff --git a/autostart/meson.build b/autostart/meson.build -new file mode 100644 -index 0000000..265088b ---- /dev/null -+++ b/autostart/meson.build -@@ -0,0 +1,18 @@ -+autostartdir = join_paths(get_option('sysconfdir'), 'xdg', 'autostart') -+ -+if get_option('patched-gsd-autostarts') -+ install_subdir( -+ 'gsd', -+ install_dir: autostartdir, -+ strip_directory: true -+ ) -+endif -+ -+ -+if get_option('patched-ubuntu-autostarts') -+ install_subdir( -+ 'ubuntu', -+ install_dir: autostartdir, -+ strip_directory: true -+ ) -+endif -diff --git a/autostart/gnome-keyring-gpg-pantheon.desktop b/autostart/ubuntu/gnome-keyring-gpg-pantheon.desktop -similarity index 100% -rename from autostart/gnome-keyring-gpg-pantheon.desktop -rename to autostart/ubuntu/gnome-keyring-gpg-pantheon.desktop -diff --git a/autostart/gnome-keyring-pkcs11-pantheon.desktop b/autostart/ubuntu/gnome-keyring-pkcs11-pantheon.desktop -similarity index 100% -rename from autostart/gnome-keyring-pkcs11-pantheon.desktop -rename to autostart/ubuntu/gnome-keyring-pkcs11-pantheon.desktop -diff --git a/autostart/gnome-keyring-secrets-pantheon.desktop b/autostart/ubuntu/gnome-keyring-secrets-pantheon.desktop -similarity index 100% -rename from autostart/gnome-keyring-secrets-pantheon.desktop -rename to autostart/ubuntu/gnome-keyring-secrets-pantheon.desktop -diff --git a/autostart/gnome-keyring-ssh-pantheon.desktop b/autostart/ubuntu/gnome-keyring-ssh-pantheon.desktop -similarity index 100% -rename from autostart/gnome-keyring-ssh-pantheon.desktop -rename to autostart/ubuntu/gnome-keyring-ssh-pantheon.desktop -diff --git a/autostart/onboard-autostart-pantheon.desktop b/autostart/ubuntu/onboard-autostart-pantheon.desktop -similarity index 100% -rename from autostart/onboard-autostart-pantheon.desktop -rename to autostart/ubuntu/onboard-autostart-pantheon.desktop -diff --git a/autostart/orca-autostart-pantheon.desktop b/autostart/ubuntu/orca-autostart-pantheon.desktop -similarity index 100% -rename from autostart/orca-autostart-pantheon.desktop -rename to autostart/ubuntu/orca-autostart-pantheon.desktop -diff --git a/autostart/user-dirs-update-gtk-pantheon.desktop b/autostart/ubuntu/user-dirs-update-gtk-pantheon.desktop -similarity index 100% -rename from autostart/user-dirs-update-gtk-pantheon.desktop -rename to autostart/ubuntu/user-dirs-update-gtk-pantheon.desktop -diff --git a/gnome-session/meson.build b/gnome-session/meson.build -new file mode 100644 -index 0000000..b9245a1 ---- /dev/null -+++ b/gnome-session/meson.build -@@ -0,0 +1,11 @@ -+fallback_session = get_option('fallback-session') -+ -+session_configuration = configuration_data() -+session_configuration.set('FALLBACK_SESSION', fallback_session) -+ -+pantheon_session = configure_file( -+ input: 'pantheon.session.in', -+ output: '@BASENAME@', -+ configuration: session_configuration, -+ install_dir: join_paths(datadir, 'gnome-session', 'sessions') -+) -diff --git a/gnome-session/pantheon.session b/gnome-session/pantheon.session.in -similarity index 94% -rename from gnome-session/pantheon.session -rename to gnome-session/pantheon.session.in -index 1626393..7bc1814 100644 ---- a/gnome-session/pantheon.session -+++ b/gnome-session/pantheon.session.in -@@ -1,5 +1,5 @@ - [GNOME Session] - Name=Pantheon - RequiredComponents=gala;gala-daemon;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings; --FallbackSession=ubuntu -+FallbackSession=@FALLBACK_SESSION@ - DesktopName=Pantheon -diff --git a/meson.build b/meson.build -new file mode 100644 -index 0000000..a7d3195 ---- /dev/null -+++ b/meson.build -@@ -0,0 +1,14 @@ -+project('elementary-session-settings', -+ version: '5.0.3', -+ default_options: 'sysconfdir=/etc') -+ -+prefix = get_option('prefix') -+datadir = join_paths(prefix, get_option('datadir')) -+ -+if get_option('defaults-list') -+ subdir('applications') -+endif -+ -+subdir('autostart') -+subdir('gnome-session') -+subdir('xsessions') -diff --git a/meson_options.txt b/meson_options.txt -new file mode 100644 -index 0000000..4c5ac2d ---- /dev/null -+++ b/meson_options.txt -@@ -0,0 +1,11 @@ -+option('defaults-list', type : 'boolean', value: true, -+ description : 'Install defaults.list') -+ -+option('patched-gsd-autostarts', type : 'boolean', value: true, -+ description : 'Install patched GNOME Settings Daemon autostarts') -+ -+option('patched-ubuntu-autostarts', type : 'boolean', value: true, -+ description : 'Install patched Ubuntu autostarts') -+ -+option('fallback-session', type : 'string', value: 'ubuntu', -+ description : 'Fallback session to use for Pantheon') -diff --git a/xsessions/meson.build b/xsessions/meson.build -new file mode 100644 -index 0000000..d144291 ---- /dev/null -+++ b/xsessions/meson.build -@@ -0,0 +1,4 @@ -+install_data( -+ 'pantheon.desktop', -+ install_dir: join_paths(datadir, 'xsessions') -+) From 53bea3717f1f1fd7ab49cc2e4b7913b6c9e85989 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 30 Mar 2020 02:37:16 -0400 Subject: [PATCH 08/15] pantheon.elementary-session-settings: add g-s-d version mappings Needed to have a correct pantheon.session gnome-session file. --- .../elementary-session-settings/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index ffe1ea4714d..c22444422be 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , substituteAll , writeScript , pantheon @@ -15,7 +16,7 @@ , writeText , meson , ninja -, git +, pkg-config }: let @@ -80,9 +81,23 @@ stdenv.mkDerivation rec { sha256 = "0n1m41aapr58rb1ffvfkjq6c6w3f0ynjzzhja50s4di98p4m7y0q"; }; + patches = [ + # Map Pantheon required components by g-s-d versions + # https://github.com/elementary/session-settings/pull/23 + (fetchpatch { + url = "https://github.com/elementary/session-settings/commit/39918f4ec64fa9ed5affa109d6a692b97ae4ff01.patch"; + sha256 = "0v2kqcsibymnslnnw4v67yh098znsrhrcycgxkw8vymvwlinc502"; + }) + ]; + nativeBuildInputs = [ meson ninja + pkg-config + ]; + + buildInputs = [ + elementary-settings-daemon ]; mesonFlags = [ From 7281bc7617b57ce0caa37a95ab2d58ca00c8bc23 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 31 Mar 2020 19:48:49 -0400 Subject: [PATCH 09/15] pantheon.gala: use-new-notifications default true --- pkgs/desktops/pantheon/desktop/gala/default.nix | 1 + .../gala/use-new-notifications-default.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/desktops/pantheon/desktop/gala/use-new-notifications-default.patch diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 643e66aef92..cbe870af8e4 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { patches = [ ./plugins-dir.patch + ./use-new-notifications-default.patch ]; postPatch = '' diff --git a/pkgs/desktops/pantheon/desktop/gala/use-new-notifications-default.patch b/pkgs/desktops/pantheon/desktop/gala/use-new-notifications-default.patch new file mode 100644 index 00000000000..dc256bcff3a --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/gala/use-new-notifications-default.patch @@ -0,0 +1,13 @@ +diff --git a/data/gala.gschema.xml b/data/gala.gschema.xml +index 8032583..7f4f03c 100644 +--- a/data/gala.gschema.xml ++++ b/data/gala.gschema.xml +@@ -58,7 +58,7 @@ + If enabled, dropping windows on vertical screen edges maximizes them vertically and resizes them horizontally to cover half of the available area. Dropping windows on the top screen edge maximizes them completely. + + +- false ++ true + If new notifications should be used + If new notifications UI should be used, requires io.elemenetary.notifications to be present and running + From ec3ee8411420e07e15398d09b5901639ad7bd9f7 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 31 Mar 2020 22:55:13 -0400 Subject: [PATCH 10/15] pantheon.elementary-default-settings: fix media key syntax --- .../desktop/elementary-default-settings/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index bf93bbd0d29..40cc18c3ce2 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -39,6 +39,12 @@ stdenv.mkDerivation rec { sha256 = "0wa7iq0vfp2av5v23w94a5844ddj4g48d4wk3yrp745dyrimg739"; }) + # Fix media key syntax + (fetchpatch { + url = "https://github.com/elementary/default-settings/commit/332aefe1883be5dfe90920e165c39e331a53b2ea.patch"; + sha256 = "0ypcaga55pw58l30srq3ga1mhz2w6hkwanv41jjr6g3ia9jvq69n"; + }) + # https://github.com/elementary/default-settings/pull/119 ./0001-Build-with-Meson.patch ]; From c15059e2b91670ac42eee6ee8b711a91b1fb7e89 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 5 Apr 2020 21:08:09 -0400 Subject: [PATCH 11/15] pantheon.wingpanel: 2.3.0 -> 2020-04-04 support 3.36 --- pkgs/desktops/pantheon/desktop/wingpanel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index ae9e31a4a09..b5a5f9395c6 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "wingpanel"; - version = "2.3.0"; + version = "unstable-2020-04-04"; src = fetchFromGitHub { owner = "elementary"; repo = pname; - rev = version; - sha256 = "0m3pd4sf86kk1wv9asq4z2816bcal076vlk820mrdz9b2fm79lh3"; + rev = "366f0f6ffa59f7ee2583d000dd334cb764f9a2b8"; + sha256 = "172r1k8m1saq80q6g2hxy4ajks8liaw9pl6lixasrzi2hsnrx53h"; }; passthru = { From acc66c83aa1fac909f69337df1b468b03ccae4f5 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 5 Apr 2020 21:08:38 -0400 Subject: [PATCH 12/15] pantheon.elementary-settings-daemon: 3.34.1 -> 3.36.0 --- .../elementary-settings-daemon/default.nix | 20 +++++++------- .../fix-paths.patch | 6 ++--- .../global-backlight-helper.patch | 26 ------------------- 3 files changed, 13 insertions(+), 39 deletions(-) delete mode 100644 pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index e5aa31ca0fb..801795ed1ce 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -43,26 +43,30 @@ stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; - version = "3.34.1"; + version = "3.36.0"; repoName = "gnome-settings-daemon"; - src = fetchgit { + src = fetchurl { + url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${repoName}-${version}.tar.xz"; + sha256 = "0jddz8f2j4ps7csgq9b694h9hjxsyhlimik6rb2f8nbcxhrg0bzs"; + }; + + ubuntuSrc = fetchgit { url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${repoName}"; - rev = "refs/tags/ubuntu/${version}-1ubuntu2"; - sha256 = "0w0dsbzif7v0gk61rs9g20ldlimbdwb5yvlfdc568yyx5z643jbv"; + rev = "refs/tags/ubuntu/3.35.91-1ubuntu1"; + sha256 = "1ifrq89pqarx74mkxykvw2kjyljd28i4ggw90l5bk4jjrwfr66f3"; }; # We've omitted the 53_sync_input_sources_to_accountsservice patch because it breaks the build. # See: https://gist.github.com/worldofpeace/2f152a20b7c47895bb93239fce1c9f52 # # Also omit ubuntu_calculator_snap.patch as that's obviously not useful here. - patches = let patchPath = "${src}/debian/patches"; in [ + patches = let patchPath = "${ubuntuSrc}/debian/patches"; in [ (substituteAll { src = ./fix-paths.patch; inherit tzdata; }) - ./global-backlight-helper.patch "${patchPath}/45_suppress-printer-may-not-be-connected-notification.patch" #"${patchPath}/53_sync_input_sources_to_accountsservice.patch" "${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch" @@ -140,10 +144,6 @@ stdenv.mkDerivation rec { # This breaks lightlocker https://github.com/elementary/session-settings/commit/b0e7a2867608c3a3916f9e4e21a68264a20e44f8 # TODO: shouldn't be neeed for the 5.1 greeter (awaiting release) rm $out/etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop - - # So the polkit policy can reference /run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper - mkdir -p $out/bin/elementary-settings-daemon - ln -s $out/libexec/gsd-backlight-helper $out/bin/elementary-settings-daemon/gsd-backlight-helper ''; passthru = { diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch b/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch index 2229302cab7..bbc82d78c77 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch @@ -1,15 +1,15 @@ --- a/plugins/datetime/tz.h +++ b/plugins/datetime/tz.h @@ -27,11 +27,7 @@ - + #include - + -#ifndef __sun -# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" -#else -# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" -#endif +#define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab" - + typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch b/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch deleted file mode 100644 index dcdc83934ba..00000000000 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c -index d7d10fd2..5619d6ad 100644 ---- a/plugins/power/gsd-backlight.c -+++ b/plugins/power/gsd-backlight.c -@@ -358,7 +358,7 @@ gsd_backlight_run_set_helper (GsdBacklight *backlight, GTask *task) - proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE, - &error, - "pkexec", -- LIBEXECDIR "/gsd-backlight-helper", -+ "/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper", - g_udev_device_get_sysfs_path (backlight->udev_device), - data->value_str, NULL); - } else { -diff --git a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in -index f16300f8..79d6bd17 100644 ---- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in -+++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in -@@ -25,7 +25,7 @@ - no - yes - -- @libexecdir@/gsd-backlight-helper -+ /run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper - - - From bf0dd34b2c9e4361dc4778dc5058fcae1ee0c57f Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 5 Apr 2020 22:47:03 -0400 Subject: [PATCH 13/15] Revert "pantheon.elementary-settings-daemon: 3.34.1 -> 3.36.0" Mutter 3.36 in gala is almost ready. This reverts commit 7160b7c31c8a44ffdd0cd0f375624c2c9c834917. --- .../elementary-settings-daemon/default.nix | 20 +++++++------- .../fix-paths.patch | 6 ++--- .../global-backlight-helper.patch | 26 +++++++++++++++++++ 3 files changed, 39 insertions(+), 13 deletions(-) create mode 100644 pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 801795ed1ce..e5aa31ca0fb 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -43,30 +43,26 @@ stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; - version = "3.36.0"; + version = "3.34.1"; repoName = "gnome-settings-daemon"; - src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${repoName}-${version}.tar.xz"; - sha256 = "0jddz8f2j4ps7csgq9b694h9hjxsyhlimik6rb2f8nbcxhrg0bzs"; - }; - - ubuntuSrc = fetchgit { + src = fetchgit { url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${repoName}"; - rev = "refs/tags/ubuntu/3.35.91-1ubuntu1"; - sha256 = "1ifrq89pqarx74mkxykvw2kjyljd28i4ggw90l5bk4jjrwfr66f3"; + rev = "refs/tags/ubuntu/${version}-1ubuntu2"; + sha256 = "0w0dsbzif7v0gk61rs9g20ldlimbdwb5yvlfdc568yyx5z643jbv"; }; # We've omitted the 53_sync_input_sources_to_accountsservice patch because it breaks the build. # See: https://gist.github.com/worldofpeace/2f152a20b7c47895bb93239fce1c9f52 # # Also omit ubuntu_calculator_snap.patch as that's obviously not useful here. - patches = let patchPath = "${ubuntuSrc}/debian/patches"; in [ + patches = let patchPath = "${src}/debian/patches"; in [ (substituteAll { src = ./fix-paths.patch; inherit tzdata; }) + ./global-backlight-helper.patch "${patchPath}/45_suppress-printer-may-not-be-connected-notification.patch" #"${patchPath}/53_sync_input_sources_to_accountsservice.patch" "${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch" @@ -144,6 +140,10 @@ stdenv.mkDerivation rec { # This breaks lightlocker https://github.com/elementary/session-settings/commit/b0e7a2867608c3a3916f9e4e21a68264a20e44f8 # TODO: shouldn't be neeed for the 5.1 greeter (awaiting release) rm $out/etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop + + # So the polkit policy can reference /run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper + mkdir -p $out/bin/elementary-settings-daemon + ln -s $out/libexec/gsd-backlight-helper $out/bin/elementary-settings-daemon/gsd-backlight-helper ''; passthru = { diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch b/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch index bbc82d78c77..2229302cab7 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch @@ -1,15 +1,15 @@ --- a/plugins/datetime/tz.h +++ b/plugins/datetime/tz.h @@ -27,11 +27,7 @@ - + #include - + -#ifndef __sun -# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" -#else -# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" -#endif +#define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab" - + typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch b/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch new file mode 100644 index 00000000000..dcdc83934ba --- /dev/null +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch @@ -0,0 +1,26 @@ +diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c +index d7d10fd2..5619d6ad 100644 +--- a/plugins/power/gsd-backlight.c ++++ b/plugins/power/gsd-backlight.c +@@ -358,7 +358,7 @@ gsd_backlight_run_set_helper (GsdBacklight *backlight, GTask *task) + proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE, + &error, + "pkexec", +- LIBEXECDIR "/gsd-backlight-helper", ++ "/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper", + g_udev_device_get_sysfs_path (backlight->udev_device), + data->value_str, NULL); + } else { +diff --git a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in +index f16300f8..79d6bd17 100644 +--- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in ++++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in +@@ -25,7 +25,7 @@ + no + yes + +- @libexecdir@/gsd-backlight-helper ++ /run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper + + + From db29696bf1f42224b5c9a2c441ed7206723fadb2 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 6 Apr 2020 02:50:27 -0400 Subject: [PATCH 14/15] pantheon.wingpanel-indicator-notifications: fix do not disturb --- .../wingpanel-indicators/notifications/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 95d19894880..3921bc50f76 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , pantheon , pkgconfig +, fetchpatch , meson , ninja , vala @@ -9,6 +10,7 @@ , granite , wingpanel , libgee +, elementary-notifications }: stdenv.mkDerivation rec { @@ -22,6 +24,15 @@ stdenv.mkDerivation rec { sha256 = "0qp13iaf2956ss4d6w6vwnzdvb7izqmyh6xrdii7j8gxxwjd4lxm"; }; + patches = [ + # Fix do not disturb on NixOS + # https://github.com/elementary/wingpanel-indicator-notifications/pull/110 + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-notifications/commit/02b1e226c0262c1535fdf2b4f1daba6be9084f67.patch"; + sha256 = "1a5phygygndr28yx8yp0lyk0wxypc5656dpidw1z8x1yd6xysqhy"; + }) + ]; + passthru = { updateScript = pantheon.updateScript { attrPath = "pantheon.${pname}"; @@ -36,6 +47,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + elementary-notifications granite gtk3 libgee From 30fef603fbe9c5675ba47de1e8eae89c93c573ed Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 6 Apr 2020 02:52:02 -0400 Subject: [PATCH 15/15] pantheon.switchboard-plug-notifications: fix do not disturb --- .../apps/switchboard-plugs/notifications/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index 781aaf2fad2..c81781a764a 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , pantheon , meson , ninja @@ -9,6 +10,7 @@ , granite , gtk3 , switchboard +, elementary-notifications }: stdenv.mkDerivation rec { @@ -22,6 +24,15 @@ stdenv.mkDerivation rec { sha256 = "1ikq058svdan0whg4ks35m50apvbmzcz7h2wznxdbsimczzvj5sz"; }; + patches = [ + # Fix do not disturb on NixOS + # https://github.com/elementary/switchboard-plug-notifications/pull/66 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-notifications/commit/c306366b39c3199f0b64eda73419005fcb5e29b8.patch"; + sha256 = "0m018rfw5iv582sw6qgwc8lzn0j32ix1w47fvlfmx0kw04irl2x3"; + }) + ]; + passthru = { updateScript = pantheon.updateScript { attrPath = "pantheon.${pname}"; @@ -36,6 +47,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + elementary-notifications granite gtk3 libgee