about summary refs log tree commit diff
path: root/pkgs/desktops/xfce
diff options
context:
space:
mode:
authorvolth <volth@webmaster.ms>2018-07-14 12:19:54 +0000
committerGitHub <noreply@github.com>2018-07-14 12:19:54 +0000
commit070b6e6fa4b212bd5b100d596f1d842e6f55ed69 (patch)
tree0feba7bee60e1bb0db0012ed75066f72f50f7a58 /pkgs/desktops/xfce
parent3e31d23d994b94b9883a39037e328c026491b999 (diff)
downloadnixlib-070b6e6fa4b212bd5b100d596f1d842e6f55ed69.tar
nixlib-070b6e6fa4b212bd5b100d596f1d842e6f55ed69.tar.gz
nixlib-070b6e6fa4b212bd5b100d596f1d842e6f55ed69.tar.bz2
nixlib-070b6e6fa4b212bd5b100d596f1d842e6f55ed69.tar.lz
nixlib-070b6e6fa4b212bd5b100d596f1d842e6f55ed69.tar.xz
nixlib-070b6e6fa4b212bd5b100d596f1d842e6f55ed69.tar.zst
nixlib-070b6e6fa4b212bd5b100d596f1d842e6f55ed69.zip
orage: fix tzdata pathes
Diffstat (limited to 'pkgs/desktops/xfce')
-rw-r--r--pkgs/desktops/xfce/applications/orage.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix
index 9b347715c45e..2c99bad8156b 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