From 3345e58db4e8364a9561dc3d488da2438aca982a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 1 Apr 2019 00:43:37 +0200 Subject: [PATCH] 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 --- nixops/modules/websites/tools/diaspora/default.nix | 4 ++-- nixops/modules/websites/tools/diaspora/diaspora.nix | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) 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; -- 2.41.0