From 447691836abd4d5f3a79492ad5b81f98c5839f8b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Apr 2013 19:08:16 +0200
Subject: [PATCH] Create a /etc/zoneinfo symlink and use it in $TZDIR

Setting $TZDIR to ${pkgs.tzdata}/share/zoneinfo can cause logged-in
sessions to refer to a garbage-collected zoneinfo directory.  So use
/etc/zoneinfo instead.
---
 modules/config/timezone.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/config/timezone.nix b/modules/config/timezone.nix
index 9de19078c10..b69df4a87ce 100644
--- a/modules/config/timezone.nix
+++ b/modules/config/timezone.nix
@@ -26,13 +26,12 @@ with pkgs.lib;
 
     environment.shellInit =
       ''
-        export TZDIR=${pkgs.tzdata}/share/zoneinfo
+        export TZDIR=/etc/zoneinfo
       '';
 
-    environment.etc = singleton
-      { source = "${pkgs.tzdata}/share/zoneinfo/${config.time.timeZone}";
-        target = "localtime";
-      };
+    environment.etc.localtime.source = "${pkgs.tzdata}/share/zoneinfo/${config.time.timeZone}";
+
+    environment.etc.zoneinfo.source = "${pkgs.tzdata}/share/zoneinfo";
 
   };