diff options
| author | volth <volth@volth.com> | 2018-07-14 12:37:27 +0000 |
|---|---|---|
| committer | volth <volth@volth.com> | 2018-07-14 13:13:25 +0000 |
| commit | d30b429cf8eb4b940ac598119dc716bf95158cfe (patch) | |
| tree | 1f6bd98c19c54fbf3ae938760f9a17cfb3123d4d | |
| parent | 134dc70dd76bb50b9b568a6b581fd8970fbf08fa (diff) | |
| download | nixlib-d30b429cf8eb4b940ac598119dc716bf95158cfe.tar nixlib-d30b429cf8eb4b940ac598119dc716bf95158cfe.tar.gz nixlib-d30b429cf8eb4b940ac598119dc716bf95158cfe.tar.bz2 nixlib-d30b429cf8eb4b940ac598119dc716bf95158cfe.tar.lz nixlib-d30b429cf8eb4b940ac598119dc716bf95158cfe.tar.xz nixlib-d30b429cf8eb4b940ac598119dc716bf95158cfe.tar.zst nixlib-d30b429cf8eb4b940ac598119dc716bf95158cfe.zip | |
xfce4-panel: fix tzdata path
| -rw-r--r-- | pkgs/desktops/xfce/core/xfce4-panel.nix | 5 | ||||
| -rw-r--r-- | pkgs/desktops/xfce4-13/xfce4-panel/default.nix | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index 17fd08faf69c..d2d992d54a88 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui , libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification -, makeWrapper, xfce4-mixer, hicolor-icon-theme +, makeWrapper, xfce4-mixer, hicolor-icon-theme, tzdata , withGtk3 ? false, gtk3, gettext, glib-networking }: let @@ -24,6 +24,9 @@ stdenv.mkDerivation rec { for f in $(find . -name \*.sh); do substituteInPlace $f --replace gettext ${gettext}/bin/gettext done + substituteInPlace plugins/clock/clock.c \ + --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" \ + --replace "if (!g_file_test (filename, G_FILE_TEST_IS_SYMLINK))" "" ''; outputs = [ "out" "dev" "devdoc" ]; 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"; }; |