diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-03-16 17:16:21 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-03-16 22:36:36 +0000 |
commit | cb6d0ec12187e0c2c11b203f3d8fa62790628141 (patch) | |
tree | 0ca0fedc67d5676e89438cffa3e0865eee0962e4 /nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel | |
parent | 4d83b8e578d3a0b78d2694921c944172b009036a (diff) | |
parent | da1a2b1eeafa66b4419b4f275396d8a731eccb61 (diff) | |
download | nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.gz nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.bz2 nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.lz nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.xz nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.zst nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.zip |
Merge commit 'da1a2b1eeafa66b4419b4f275396d8a731eccb61'
Diffstat (limited to 'nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel')
-rw-r--r-- | nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index a5ca227bbc20..c34beab7600d 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/nixpkgs/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 |