Remove unused dependencies for diaspora

diff --git a/virtual/modules/websites/tools/diaspora/default.nix b/virtual/modules/websites/tools/diaspora/default.nix
index b15b9ce9619791d3829acc877db5b2562176d03b..ae870b082a2a4c892f185e4861e978951c89240a 100644 (file)
--- a/virtual/modules/websites/tools/diaspora/default.nix
+++ b/virtual/modules/websites/tools/diaspora/default.nix
@@ -34,7 +34,7 @@ in {
       wants = [ "redis.service" "postgresql.service" ];
 
       environment.RAILS_ENV = "production";
-      environment.BUNDLE_PATH = "${diaspora.gems}/lib/ruby/gems/2.4.0";
+      environment.BUNDLE_PATH = "${diaspora.gems}/${diaspora.gems.ruby.gemPath}";
       environment.BUNDLE_GEMFILE = "${diaspora.gems.confFiles}/Gemfile";
       environment.EYE_SOCK = "${diaspora.socketsDir}/eye.sock";
       environment.EYE_PID = "${diaspora.socketsDir}/eye.pid";

diff --git a/virtual/modules/websites/tools/diaspora/diaspora.nix b/virtual/modules/websites/tools/diaspora/diaspora.nix
index e067253adcd8b895ad0433406f3e59189bf353df..be3e426e660bf9813211ec2deb8f3550593fdebe 100644 (file)
--- 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}'
@@ -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
   {