pyrox.dev
xfce4-13.orage: fix tzdata pathes
+11
-3
pkgs/desktops/xfce4-13/orage/default.nix
+11
-3
pkgs/desktops/xfce4-13/orage/default.nix
···
1
-
{ lib, fetchpatch, mkXfceDerivation, dbus_glib ? null, gtk2, libical, libnotify ? null
2
-
, popt ? null, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }:
1
+
{ lib, fetchpatch, mkXfceDerivation, dbus-glib, gtk2, libical, libnotify, tzdata
2
+
, popt, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }:
3
3
4
4
assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null;
5
5
···
13
13
version = "4.12.1";
14
14
15
15
sha256 = "04z6y1vfaz1im1zq1zr7cf8pjibjhj9zkyanbp7vn30q520yxa0m";
16
-
buildInputs = [ dbus_glib gtk2 libical libnotify popt ]
16
+
buildInputs = [ dbus-glib gtk2 libical libnotify popt ]
17
17
++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ];
18
+
19
+
postPatch = ''
20
+
substituteInPlace src/parameters.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
21
+
substituteInPlace src/tz_zoneinfo_read.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
22
+
substituteInPlace tz_convert/tz_convert.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
23
+
'';
24
+
25
+
postConfigure = "rm -rf libical"; # ensure pkgs.libical is used instead of one included in the orage sources
18
26
19
27
patches = [
20
28
# Fix build with libical 3.0