diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-22 11:04:28 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-22 11:04:28 +0200 |
commit | 6c72782d364149c7cfea1ea69fdbc1133acc80b5 (patch) | |
tree | ffb22d1fb7e0f1432c0f4e4063759d61a8bf6e0c /pkgs/desktops/xfce | |
parent | b21994d4ac9c2c8d372bf011668401ee31972c0b (diff) | |
parent | 452017032ac8af0c5e09d5abbf7a562ae524fea7 (diff) | |
download | nixpkgs-6c72782d364149c7cfea1ea69fdbc1133acc80b5.tar nixpkgs-6c72782d364149c7cfea1ea69fdbc1133acc80b5.tar.gz nixpkgs-6c72782d364149c7cfea1ea69fdbc1133acc80b5.tar.bz2 nixpkgs-6c72782d364149c7cfea1ea69fdbc1133acc80b5.tar.lz nixpkgs-6c72782d364149c7cfea1ea69fdbc1133acc80b5.tar.xz nixpkgs-6c72782d364149c7cfea1ea69fdbc1133acc80b5.tar.zst nixpkgs-6c72782d364149c7cfea1ea69fdbc1133acc80b5.zip |
Merge staging-next into master
Diffstat (limited to 'pkgs/desktops/xfce')
-rw-r--r-- | pkgs/desktops/xfce/applications/orage.nix | 10 | ||||
-rw-r--r-- | pkgs/desktops/xfce/core/xfce4-panel.nix | 5 |
2 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix index 9b347715c45..2c99bad8156 100644 --- a/pkgs/desktops/xfce/applications/orage.nix +++ b/pkgs/desktops/xfce/applications/orage.nix @@ -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 }: @@ -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 ]; buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index 17fd08faf69..d2d992d54a8 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" ]; |