Temporarily fix diaspora package

Upgrade from 18.09 to 19.03 broke because of change at
https://github.com/NixOS/nixpkgs/pull/51842
This partially reverts the change, which permits to build again diaspora
using the latest pkgs version.

Related issue: https://git.immae.eu/mantisbt/view.php?id=131

diff --git a/nixops/modules/websites/tools/diaspora/default.nix b/nixops/modules/websites/tools/diaspora/default.nix
index 7a2af975e2179d5659ce437b079da8cf0ebf2696..b1cb6f2e5ea9c0693b081ffd5f6a1861271d506e 100644 (file)
--- a/nixops/modules/websites/tools/diaspora/default.nix
+++ b/nixops/modules/websites/tools/diaspora/default.nix
@@ -1,6 +1,6 @@
-{ lib, pkgs, pkgsPrevious, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig, mylibs, ... }:
 let
-  diaspora = pkgsPrevious.callPackage ./diaspora.nix {
+  diaspora = pkgs.callPackage ./diaspora.nix {
     inherit (mylibs) fetchedGithub;
     env = myconfig.env.tools.diaspora;
   };

diff --git a/nixops/modules/websites/tools/diaspora/diaspora.nix b/nixops/modules/websites/tools/diaspora/diaspora.nix
index 616c5cc6533faa13c53cd1257478c9a202463a52..a57c529b92dff7257c8680f26ea36187853b1929 100644 (file)
--- a/nixops/modules/websites/tools/diaspora/diaspora.nix
+++ b/nixops/modules/websites/tools/diaspora/diaspora.nix
@@ -15,7 +15,10 @@ let
   });
   gems = bundlerEnv {
     name = "diaspora-env";
-    ruby = ruby_2_4;
+    # https://git.immae.eu/mantisbt/view.php?id=131
+    ruby = ruby_2_4.overrideAttrs(old: {
+      postInstall = builtins.replaceStrings [" --destdir $GEM_HOME"] [""] old.postInstall;
+    });
     gemfile = "${diaspora}/Gemfile";
     lockfile = "${diaspora}/Gemfile.lock";
     gemset = ./gemset.nix;