From 1be1a523cb04a5079e2212f3ab5a09b6591a4340 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sat, 2 Mar 2019 00:51:26 +0100
Subject: [PATCH] Fix finch and timezone for pub user

---
 nixops/modules/pub/default.nix | 10 +++++++++-
 nixops/modules/pub/restrict    |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixops/modules/pub/default.nix b/nixops/modules/pub/default.nix
index 59263ad..f566e69 100644
--- a/nixops/modules/pub/default.nix
+++ b/nixops/modules/pub/default.nix
@@ -24,6 +24,14 @@
           --prefix PATH : ${lib.makeBinPath [ pkgs.bubblewrap pkgs.rrsync ]} \
           --set TMUX_RESTRICT ${./tmux.restrict.conf}
       '';
+      purple-hangouts = pkgs.purple-hangouts.overrideAttrs(old: {
+        installPhase = ''
+          install -Dm755 -t $out/lib/purple-2/ libhangouts.so
+          for size in 16 22 24 48; do
+            install -TDm644 hangouts$size.png $out/share/pixmaps/pidgin/protocols/$size/hangouts.png
+          done
+          '';
+      });
     in {
       createHome = true;
       description = "Restricted shell user";
@@ -34,7 +42,7 @@
         restrict
         pkgs.tmux
         (pkgs.pidgin.override { plugins = [
-          pkgs.purple-plugin-pack pkgs.purple-hangouts
+          pkgs.purple-plugin-pack purple-hangouts
           pkgs.purple-discord pkgs.purple-facebook
           pkgs.telegram-purple
         ]; })
diff --git a/nixops/modules/pub/restrict b/nixops/modules/pub/restrict
index a16d7a5..6d80590 100644
--- a/nixops/modules/pub/restrict
+++ b/nixops/modules/pub/restrict
@@ -34,6 +34,7 @@ rsync*)
               --proc /proc \
               --dev /dev \
               --ro-bind /etc/resolv.conf /etc/resolv.conf \
+              --ro-bind /etc/zoneinfo /etc/zoneinfo \
               --ro-bind /run/current-system/sw/lib/locale/locale-archive /etc/locale-archive \
               --ro-bind /run/current-system/sw/bin /bin \
               --ro-bind /etc/profiles/per-user/pub/bin /bin-pub \
-- 
2.41.0