Remove use of environment variables

Fixes https://git.immae.eu/mantisbt/view.php?id=113

1 files changed, 7 insertions, 4 deletions

diff --git a/virtual/modules/websites/tools/tools/default.nix b/virtual/modules/websites/tools/tools/default.nix
index d69ccc9..294959c 100644
--- a/virtual/modules/websites/tools/tools/default.nix
+++ b/virtual/modules/websites/tools/tools/default.nix
@@ -1,10 +1,13 @@
-{ lib, pkgs, config, mylibs, ... }:
+{ lib, pkgs, config, myconfig, mylibs, ... }:
 let
     adminer = pkgs.callPackage ../../commons/adminer.nix {};
     ympd = pkgs.callPackage ./ympd.nix {};
-    ttrss = pkgs.callPackage ./ttrss.nix { inherit (mylibs) checkEnv fetchedGithub fetchedGit; };
-    roundcubemail = pkgs.callPackage ./roundcubemail.nix { inherit (mylibs) checkEnv; };
-    wallabag = pkgs.callPackage ./wallabag.nix { inherit (mylibs) checkEnv; };
+    ttrss = pkgs.callPackage ./ttrss.nix {
+      inherit (mylibs) fetchedGithub fetchedGit;
+      env = myconfig.env.tools.ttrss;
+    };
+    roundcubemail = pkgs.callPackage ./roundcubemail.nix { env = myconfig.env.tools.roundcubemail; };
+    wallabag = pkgs.callPackage ./wallabag.nix { env = myconfig.env.tools.wallabag; };
 
     cfg = config.services.myWebsites.tools.tools;
 in {