Move unneeded system packages to a better place

[perso/Immae/Config/Nix.git] / nixops / modules / websites / commons / stats.nix

diff --git a/nixops/modules/websites/commons/stats.nix b/nixops/modules/websites/commons/stats.nix
index 8d618c5cd61f73354d5b28a9feceee81f2104dc8..88559b1e573d1262c9b26a36c169f68ebd5df3a0 100644 (file)
--- a/nixops/modules/websites/commons/stats.nix
+++ b/nixops/modules/websites/commons/stats.nix
@@ -19,17 +19,10 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    environment.systemPackages = [
+    users.users.root.packages = [
       pkgs.goaccess
     ];
 
-    nixpkgs.overlays = [ (self: super: rec {
-      goaccess = super.goaccess.overrideAttrs(old: rec {
-        configureFlags = old.configureFlags ++ [ "--enable-tcb=btree" ];
-        buildInputs = old.buildInputs ++ [ self.tokyocabinet self.bzip2 ];
-      });
-    }) ];
-
     services.cron = {
       enable = true;
       systemCronJobs = let
@@ -46,7 +39,7 @@ in {
             for i in /var/log/httpd/access_log-${domain}*.gz; do
               zcat "$i" | sed -n "/\\[$date_regex/ p" >> $TMPFILE
             done
-            goaccess $TMPFILE --no-progress -o /var/lib/goaccess/${domain}/index.html -p ${conf}
+            ${pkgs.goaccess}/bin/goaccess $TMPFILE --no-progress -o /var/lib/goaccess/${domain}/index.html -p ${conf}
             '';
           in "${d}/bin/stats-${domain}";
         allStats = sites: pkgs.writeScript "stats" ''