From a64edad2a8784b8e68bf040b21f5a54fbc329b9f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 29 Jun 2018 15:39:08 +0200 Subject: [PATCH] xfce4-13.orage: fix build with libical3 --- pkgs/desktops/xfce4-13/orage/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/xfce4-13/orage/default.nix b/pkgs/desktops/xfce4-13/orage/default.nix index 6a2f37cbef6..3857846ea82 100644 --- a/pkgs/desktops/xfce4-13/orage/default.nix +++ b/pkgs/desktops/xfce4-13/orage/default.nix @@ -1,4 +1,4 @@ -{ lib, mkXfceDerivation, dbus_glib ? null, gtk2, libical, libnotify ? null +{ lib, fetchpatch, mkXfceDerivation, dbus_glib ? null, gtk2, libical, libnotify ? null , popt ? null, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }: assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null; @@ -15,4 +15,13 @@ mkXfceDerivation rec { sha256 = "04z6y1vfaz1im1zq1zr7cf8pjibjhj9zkyanbp7vn30q520yxa0m"; buildInputs = [ dbus_glib gtk2 libical libnotify popt ] ++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ]; + + patches = [ + # Fix build with libical 3.0 + (fetchpatch { + name = "fix-libical3.patch"; + url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/libical3.patch?h=packages/orage&id=7b1b06c42dda034d538977b9f3550b28e370057f; + sha256 = "1l8s106mcidmbx2p8c2pi8v9ngbv2x3fsgv36j8qk8wyd4qd1jbf"; + }) + ]; }