diff options
Diffstat (limited to 'nixops')
-rw-r--r-- | nixops/modules/websites/tools/diaspora/default.nix | 4 | ||||
-rw-r--r-- | 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 @@ | |||
1 | { lib, pkgs, pkgsPrevious, config, myconfig, mylibs, ... }: | 1 | { lib, pkgs, config, myconfig, mylibs, ... }: |
2 | let | 2 | let |
3 | diaspora = pkgsPrevious.callPackage ./diaspora.nix { | 3 | diaspora = pkgs.callPackage ./diaspora.nix { |
4 | inherit (mylibs) fetchedGithub; | 4 | inherit (mylibs) fetchedGithub; |
5 | env = myconfig.env.tools.diaspora; | 5 | env = myconfig.env.tools.diaspora; |
6 | }; | 6 | }; |
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 | |||
15 | }); | 15 | }); |
16 | gems = bundlerEnv { | 16 | gems = bundlerEnv { |
17 | name = "diaspora-env"; | 17 | name = "diaspora-env"; |
18 | ruby = ruby_2_4; | 18 | # https://git.immae.eu/mantisbt/view.php?id=131 |
19 | ruby = ruby_2_4.overrideAttrs(old: { | ||
20 | postInstall = builtins.replaceStrings [" --destdir $GEM_HOME"] [""] old.postInstall; | ||
21 | }); | ||
19 | gemfile = "${diaspora}/Gemfile"; | 22 | gemfile = "${diaspora}/Gemfile"; |
20 | lockfile = "${diaspora}/Gemfile.lock"; | 23 | lockfile = "${diaspora}/Gemfile.lock"; |
21 | gemset = ./gemset.nix; | 24 | gemset = ./gemset.nix; |