Add skins for roundcube

diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix
index b1fd8f2fb2f9c313a5249aa90a5b09e791f1c523..8edbdd9aa13b56a38350737ac8892d16d4f6bcc3 100644 (file)
--- a/nixops/modules/websites/tools/tools/default.nix
+++ b/nixops/modules/websites/tools/tools/default.nix
@@ -8,7 +8,10 @@ let
       inherit (mylibs) fetchedGithub fetchedGit;
       env = myconfig.env.tools.ttrss;
     };
-    roundcubemail = pkgs.callPackage ./roundcubemail.nix { env = myconfig.env.tools.roundcubemail; };
+    roundcubemail = pkgs.callPackage ./roundcubemail.nix {
+      inherit (mylibs) fetchedGithub;
+      env = myconfig.env.tools.roundcubemail;
+    };
     rainloop = pkgs.callPackage ./rainloop.nix  {};
     kanboard = pkgs.callPackage ./kanboard.nix  {
       inherit (mylibs) fetchedGithub;

diff --git a/nixops/modules/websites/tools/tools/roundcubemail.nix b/nixops/modules/websites/tools/tools/roundcubemail.nix
index c0a1125835cfc72c6e5141862fa4b7a59cc95615..58a1be51e49ec254f892f41871fc303742515230 100644 (file)
--- a/nixops/modules/websites/tools/tools/roundcubemail.nix
+++ b/nixops/modules/websites/tools/tools/roundcubemail.nix
@@ -1,7 +1,8 @@
-{ lib, env, writeText, stdenv, fetchurl }:
+{ lib, env, writeText, stdenv, fetchurl, fetchedGithub }:
 let
   roundcubemail = let
     plugins = {};
+    skins = {};
   in rec {
     varDir = "/var/lib/roundcubemail";
     activationScript = {
@@ -59,6 +60,9 @@ let
         ${builtins.concatStringsSep "\n" (
           lib.attrsets.mapAttrsToList (name: value: "ln -sf ${value} $out/plugins/${name}") plugins
         )}
+        ${builtins.concatStringsSep "\n" (
+          lib.attrsets.mapAttrsToList (name: value: "ln -sf ${value} $out/skins/${name}") skins
+        )}
       '';
     };
     apache = rec {
@@ -84,7 +88,8 @@ let
     phpFpm = rec {
       basedir = builtins.concatStringsSep ":" (
         [ webRoot config varDir ]
-        ++ lib.attrsets.mapAttrsToList (name: value: value) plugins);
+        ++ lib.attrsets.mapAttrsToList (name: value: value) plugins
+        ++ lib.attrsets.mapAttrsToList (name: value: value) skins);
       socket = "/var/run/phpfpm/roundcubemail.sock";
       pool = ''
         listen = ${socket}