From d77abebf891ff38da9df5e2881d5bcaf2093b707 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 29 Jun 2018 15:31:21 +0200 Subject: [PATCH] xfce.orage: fix build with libical3 --- pkgs/desktops/xfce/applications/orage.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix index 812630e17d06..9b347715c45e 100644 --- a/pkgs/desktops/xfce/applications/orage.nix +++ b/pkgs/desktops/xfce/applications/orage.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib +{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib , libnotify, popt, xfce }: @@ -13,8 +13,17 @@ stdenv.mkDerivation rec { sha256 = "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w"; }; + 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"; + }) + ]; + nativeBuildInputs = [ pkgconfig intltool bison flex ]; - + buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util xfce.xfce4-panel ];