Merge pull request #43522 from volth/patch-187
orage: "/usr/share/zoneinfo" -> "${tzdata}/share/zoneinfo"
This commit is contained in:
commit
dca7b10fd5
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib
|
{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib, tzdata
|
||||||
, libnotify, popt, xfce
|
, libnotify, popt, xfce
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -22,6 +22,14 @@ stdenv.mkDerivation rec {
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig intltool bison flex ];
|
nativeBuildInputs = [ pkgconfig intltool bison flex ];
|
||||||
|
|
||||||
buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util
|
buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util
|
||||||
|
|
|
@ -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" ];
|
||||||
|
|
|
@ -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 {
|
||||||
|
|
|
@ -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";
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue