From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sun, 31 Mar 2019 22:43:37 +0000 (+0200)
Subject: Temporarily fix diaspora package
X-Git-Tag: nur_publish~179
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=3345e58db4e8364a9561dc3d488da2438aca982a;hp=7ac9bef4930a10101f02cbfdc4c75351e98553d6;p=perso%2FImmae%2FConfig%2FNix.git

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 7a2af97..b1cb6f2 100644
--- 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 616c5cc..a57c529 100644
--- 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;