about summary refs log tree commit diff
path: root/pkgs/desktops/pantheon
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@users.noreply.github.com>2019-03-07 17:17:48 -0500
committerworldofpeace <worldofpeace@users.noreply.github.com>2019-03-07 17:36:56 -0500
commit3ba5f177f0bff7197e1c21fdd32f7b8d6279adc9 (patch)
treeb5c32e443c98f78ef4cc01c7d6744bb3c5816d81 /pkgs/desktops/pantheon
parentd7764de5075e3c12a316180814ae8f8b95d1eed9 (diff)
downloadnixlib-3ba5f177f0bff7197e1c21fdd32f7b8d6279adc9.tar
nixlib-3ba5f177f0bff7197e1c21fdd32f7b8d6279adc9.tar.gz
nixlib-3ba5f177f0bff7197e1c21fdd32f7b8d6279adc9.tar.bz2
nixlib-3ba5f177f0bff7197e1c21fdd32f7b8d6279adc9.tar.lz
nixlib-3ba5f177f0bff7197e1c21fdd32f7b8d6279adc9.tar.xz
nixlib-3ba5f177f0bff7197e1c21fdd32f7b8d6279adc9.tar.zst
nixlib-3ba5f177f0bff7197e1c21fdd32f7b8d6279adc9.zip
pantheon.wingpanel: fix potentially overlapping windows
https://github.com/elementary/wingpanel/pull/198
Diffstat (limited to 'pkgs/desktops/pantheon')
-rw-r--r--pkgs/desktops/pantheon/desktop/wingpanel/default.nix11
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
index a5ca227bbc20..c34beab7600d 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pantheon, wrapGAppsHook, pkgconfig, meson, ninja
+{ stdenv, fetchFromGitHub, pantheon, fetchpatch, wrapGAppsHook, pkgconfig, meson, ninja
 , vala, gala, gtk3, libgee, granite, gettext, glib-networking, mutter, json-glib
 , python3, gobject-introspection }:
 
@@ -40,7 +40,14 @@ stdenv.mkDerivation rec {
     mutter
   ];
 
-  patches = [ ./indicators.patch ];
+  patches = [
+    ./indicators.patch
+    # Fix wingpanel potentially overlapping windows: https://github.com/elementary/wingpanel/pull/198
+    (fetchpatch {
+      url = "https://github.com/elementary/wingpanel/commit/fc1b8ea3d6cfc5d6e4034af177eecd4542a59833.patch";
+      sha256 = "0w5z56di5lxwg9vb96f9y4r2q05znwpn814m2w12l3impf5xsdqs";
+    })
+  ];
 
   postPatch = ''
     chmod +x meson/post_install.py