diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-17 10:06:32 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-17 10:06:32 +0200 |
| commit | 9f208b5d8aa10518eb92ed5b7d77e4a588b5154c (patch) | |
| tree | e521ba305aa4848b216a15e2eac0e69acdb0d1e9 /pkgs/desktops/xfce4-13 | |
| parent | 9d0336a2bbe933c1a8e6ea7c7b39eb7ff071ef66 (diff) | |
| parent | 12949bf84ab06bebb854a07082bf5c32f5e14892 (diff) | |
| download | nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.gz nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.bz2 nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.lz nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.xz nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.zst nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/desktops/xfce4-13')
| -rw-r--r-- | pkgs/desktops/xfce4-13/orage/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/desktops/xfce4-13/xfce4-panel/default.nix | 8 |
2 files changed, 18 insertions, 4 deletions
diff --git a/pkgs/desktops/xfce4-13/orage/default.nix b/pkgs/desktops/xfce4-13/orage/default.nix index 3857846ea82d..3c8395a49088 100644 --- a/pkgs/desktops/xfce4-13/orage/default.nix +++ b/pkgs/desktops/xfce4-13/orage/default.nix @@ -1,5 +1,5 @@ -{ lib, fetchpatch, mkXfceDerivation, dbus_glib ? null, gtk2, libical, libnotify ? null -, popt ? null, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }: +{ lib, fetchpatch, mkXfceDerivation, dbus-glib, gtk2, libical, libnotify, tzdata +, popt, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }: assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null; @@ -13,9 +13,17 @@ mkXfceDerivation rec { version = "4.12.1"; sha256 = "04z6y1vfaz1im1zq1zr7cf8pjibjhj9zkyanbp7vn30q520yxa0m"; - buildInputs = [ dbus_glib gtk2 libical libnotify popt ] + buildInputs = [ dbus-glib gtk2 libical libnotify popt ] ++ 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 = [ # Fix build with libical 3.0 (fetchpatch { diff --git a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix index 88ba2de49be0..db05517eb0bf 100644 --- a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, exo, garcon, gtk2, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }: +{ mkXfceDerivation, tzdata, exo, garcon, gtk2, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }: mkXfceDerivation rec { category = "xfce"; @@ -9,6 +9,12 @@ mkXfceDerivation rec { buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ]; + postPatch = '' + substituteInPlace plugins/clock/clock.c \ + --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" \ + --replace "if (!g_file_test (filename, G_FILE_TEST_IS_SYMLINK))" "" + ''; + meta = { description = "Xfce's panel"; }; |