X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=default.nix;h=bc8ecc99c8250283f53a095c0f460ff9fd95b13f;hp=4e50c59f397510a10e7a725c6a18a4f55a9d757c;hb=a7f7fdae99f7617fb7fdabe1e65423e02a4982b1;hpb=c7f50486428f67b91dea675704288134f835674c

diff --git a/default.nix b/default.nix
index 4e50c59..bc8ecc9 100644
--- a/default.nix
+++ b/default.nix
@@ -241,25 +241,17 @@ let
   #     '';
   # });
 
-  mastodon = stdenv.mkDerivation (fetchedGithub ./fetched/mastodon.json // rec {
-    buildPhase = ''
-      export GIT_SSL_CAINFO=${cacert}/etc/ssl/certs/ca-bundle.crt
-      export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
-
-      bundle install --deployment --without development test
-      yarn install --pure-lockfile
-    '';
-    installPhase = ''
-      cp -a . $out
-    '';
-    propagatedBuildInputs = [
-      zlib icu libchardet git bundler yarn
-      protobuf protobufc libidn libpqxx nodejs
-      imagemagick ffmpeg libxml2 libxslt pkgconfig
-      autoconf bison libyaml readline ncurses libffi gdbm
-      jemalloc which postgresql python3 cacert
-    ];
+  mypkgs.goaccess = goaccess.overrideAttrs(old: rec {
+    name = "goaccess-${version}";
+    version = "1.3";
+    src = fetchurl {
+      url = "https://tar.goaccess.io/${name}.tar.gz";
+      sha256 = "16vv3pj7pbraq173wlxa89jjsd279004j4kgzlrsk1dz4if5qxwc";
+    };
+    configureFlags = old.configureFlags ++ [ "--enable-tcb=btree" ];
+    buildInputs = old.buildInputs ++ [ tokyocabinet bzip2 ];
   });
+
 # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh
 # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks
 in
@@ -300,7 +292,6 @@ in
     inherit mtr;
     inherit nixops;
     stgit = gitAndTools.stgit;
-    #inherit mastodon;
     # todo: lx* ?, unrar, unzip, zeromq?
     #inherit nextcloud-client;
     #inherit nixos;
@@ -319,4 +310,5 @@ in
     inherit strace;
     inherit notmuch;
     stgit = gitAndTools.stgit;
+    inherit bundix;
   })