From 1e084a85d288430908b3cf56c7cb8af9488a983e Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 26 Jul 2020 15:30:53 -0400 Subject: [PATCH] pantheon.wingpanel-indicator-session: fix build with latest vala --- .../wingpanel-indicators/session/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index 14c87036ec8..e9313525821 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , pantheon , pkgconfig , meson @@ -23,6 +24,19 @@ stdenv.mkDerivation rec { sha256 = "02inp8xdxfx8qxjdf2nazw46ahp1gv3skd922ma6kgx5w4wxh5l8"; }; + patches = [ + # build failure in vala 0.48.7 + # https://github.com/elementary/gala/pull/869#issuecomment-657147695 + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-session/commit/ead6971c708eed8b844bd9acd7eed2ab8a97e803.patch"; + sha256 = "1v7w7zdia82d38ycr5zhckaxgf7gr15hsv05cv5khlki8frryn2x"; + }) + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-session/commit/85347e676054635ac878fc542bd057398ca70d3e.patch"; + sha256 = "1vw4zx0qbhxmfzqhdcmwdp4fxvij7n3f5lwcplf5v3k9qsr3wm0n"; + }) + ]; + passthru = { updateScript = pantheon.updateScript { attrPath = "pantheon.${pname}";