X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=virtual%2Fmodules%2Fwebsites%2Ftools%2Fdiaspora%2Fdiaspora.nix;h=798ebe6707d22a4b6245a8b3e0815710d3e7f77e;hb=b0781dbc85da7bba5a3a9209ca4d3b3900eea7b5;hp=39de20248d749849a0260d19c1e9e27fd1ec1f2e;hpb=9d90e7e281e8f4cf9371c17c812a1ac9c08aa66d;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/virtual/modules/websites/tools/diaspora/diaspora.nix b/virtual/modules/websites/tools/diaspora/diaspora.nix
index 39de202..798ebe6 100644
--- a/virtual/modules/websites/tools/diaspora/diaspora.nix
+++ b/virtual/modules/websites/tools/diaspora/diaspora.nix
@@ -12,23 +12,13 @@ let
   };
   varDir = "/var/lib/diaspora_immae";
   socketsDir = "/run/diaspora";
-  buildInputs =  [ gems ] ++ (with pkgs; [
-    git redis imagemagick libxslt nodejs
-    jemalloc cacert ruby_2_4
-    openssl postgresql curl libnghttp2
-    pkgconfig which
-  ]);
   diaspora = stdenv.mkDerivation (fetchedGithub ./diaspora.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
-
       patch -p1 < ${./ldap.patch}
     '';
     installPhase = ''
       cp -a . $out
     '';
-    propagatedBuildInputs = buildInputs;
   });
   secret_token = writeText "secret_token.rb" ''
     Diaspora::Application.config.secret_key_base = '${env.secret_token}'
@@ -37,8 +27,8 @@ let
       configuration:
         environment:
           url: "https://diaspora.immae.eu/"
-          certificate_authorities: '/etc/ssl/certs/ca-certificates.crt'
-          redis: 'redis://localhost:6379/15'
+          certificate_authorities: '${cacert}/etc/ssl/certs/ca-bundle.crt'
+          redis: '${env.redis_url}'
           sidekiq:
           s3:
           assets:
@@ -155,7 +145,7 @@ let
         ln -sf ../../../../../${varDir}/tmp tmp
         ln -sf ../../../../../${varDir}/log log
         '';
-      propagatedBuildInputs = buildInputs;
+      propagatedBuildInputs = [ gems pkgs.nodejs pkgs.which pkgs.git ];
     };
 in
   {