summary refs log tree commit diff
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2020-03-31 22:19:56 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2020-04-06 02:48:07 -0400
commit50fe769887388c78c6084678e02f146d9ec9a3a4 (patch)
tree2af7dff9645d30d15f469d215c3acef1a8392c0c
parentb0f0003c6e2dc227fca3c4ab97464609910c51bf (diff)
downloadnixpkgs-50fe769887388c78c6084678e02f146d9ec9a3a4.tar
nixpkgs-50fe769887388c78c6084678e02f146d9ec9a3a4.tar.gz
nixpkgs-50fe769887388c78c6084678e02f146d9ec9a3a4.tar.bz2
nixpkgs-50fe769887388c78c6084678e02f146d9ec9a3a4.tar.lz
nixpkgs-50fe769887388c78c6084678e02f146d9ec9a3a4.tar.xz
nixpkgs-50fe769887388c78c6084678e02f146d9ec9a3a4.tar.zst
nixpkgs-50fe769887388c78c6084678e02f146d9ec9a3a4.zip
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.
-rw-r--r--nixos/modules/services/x11/desktop-managers/pantheon.nix1
-rw-r--r--pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix7
2 files changed, 8 insertions, 0 deletions
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
   ];