public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfce4-13.orage: fix tzdata pathes

Browse Source
This commit is contained in:
volth 2018-07-14 12:21:06 +00:00 committed by GitHub
parent 070b6e6fa4
commit 134dc70dd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/desktops/xfce4-13/orage/default.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchpatch, mkXfceDerivation, dbus_glib ? null, gtk2, libical, libnotify ? null { lib, fetchpatch, mkXfceDerivation, dbus-glib, gtk2, libical, libnotify, tzdata
, popt ? null, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }: , popt, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }:
assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null; assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null;
@ -13,9 +13,17 @@ mkXfceDerivation rec {
version = "4.12.1"; version = "4.12.1";
sha256 = "04z6y1vfaz1im1zq1zr7cf8pjibjhj9zkyanbp7vn30q520yxa0m"; sha256 = "04z6y1vfaz1im1zq1zr7cf8pjibjhj9zkyanbp7vn30q520yxa0m";
buildInputs = [ dbus_glib gtk2 libical libnotify popt ] buildInputs = [ dbus-glib gtk2 libical libnotify popt ]
++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ]; ++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ];
postPatch = ''
substituteInPlace src/parameters.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
substituteInPlace src/tz_zoneinfo_read.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
substituteInPlace tz_convert/tz_convert.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
'';
postConfigure = "rm -rf libical"; # ensure pkgs.libical is used instead of one included in the orage sources
patches = [ patches = [
# Fix build with libical 3.0 # Fix build with libical 3.0
(fetchpatch { (fetchpatch {