Merge pull request #31359 from deedrah/pr/gnome_settings_tzdata

gnome3.gnome-settings-daemon: use zone.tab from tzdata
This commit is contained in:
Jan Tojnar 2017-11-24 12:55:16 +01:00 committed by GitHub
commit f764b5408e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,7 +1,7 @@
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
, libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager
, docbook_xsl, docbook_xsl_ns, wrapGAppsHook, ibus, xkeyboard_config }:
, docbook_xsl, docbook_xsl_ns, wrapGAppsHook, ibus, xkeyboard_config, tzdata }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt
libtool docbook_xsl docbook_xsl_ns wrapGAppsHook gnome_themes_standard ];
postPatch = ''
substituteInPlace plugins/datetime/tz.h --replace /usr/share/zoneinfo/zone.tab ${tzdata}/share/zoneinfo/zone.tab
'';
meta = with stdenv.lib; {
platforms = platforms.linux;
maintainers = gnome3.maintainers;