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

xfce4-panel: fix tzdata path

Browse Source
This commit is contained in:
volth 2018-07-14 12:37:27 +00:00
parent 134dc70dd7
commit d30b429cf8
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/desktops/xfce/core/xfce4-panel.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
, libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification , 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 , withGtk3 ? false, gtk3, gettext, glib-networking
}: }:
let let
@ -24,6 +24,9 @@ stdenv.mkDerivation rec {
for f in $(find . -name \*.sh); do for f in $(find . -name \*.sh); do
substituteInPlace $f --replace gettext ${gettext}/bin/gettext substituteInPlace $f --replace gettext ${gettext}/bin/gettext
done 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" ]; outputs = [ "out" "dev" "devdoc" ];

8
pkgs/desktops/xfce4-13/xfce4-panel/default.nix
View File

@ -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 { mkXfceDerivation rec {
category = "xfce"; category = "xfce";
@ -9,6 +9,12 @@ mkXfceDerivation rec {
buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ]; 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 = { meta = {
description = "Xfce's panel"; description = "Xfce's panel";
}; };