diff options
| author | Charles Strahan <charles.c.strahan@gmail.com> | 2015-01-21 23:27:38 -0500 |
|---|---|---|
| committer | Charles Strahan <charles.c.strahan@gmail.com> | 2015-01-21 23:27:38 -0500 |
| commit | 8d49e87decc73b57f42f25b81a734fd7e026c036 (patch) | |
| tree | 24c2719a56f12cc957585abd7cf0c85cec49d54a /nixos | |
| parent | ea5594679c438a4666f29a209f68b6cce81054f5 (diff) | |
| parent | 034488ec80bb5efd5e2945fed660a2e3003099f3 (diff) | |
| download | nixlib-8d49e87decc73b57f42f25b81a734fd7e026c036.tar nixlib-8d49e87decc73b57f42f25b81a734fd7e026c036.tar.gz nixlib-8d49e87decc73b57f42f25b81a734fd7e026c036.tar.bz2 nixlib-8d49e87decc73b57f42f25b81a734fd7e026c036.tar.lz nixlib-8d49e87decc73b57f42f25b81a734fd7e026c036.tar.xz nixlib-8d49e87decc73b57f42f25b81a734fd7e026c036.tar.zst nixlib-8d49e87decc73b57f42f25b81a734fd7e026c036.zip | |
Merge pull request #4677 from cstrahan/pleasant-ruby
Pleasant ruby
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/redmine.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/services/monitoring/riemann-dash.nix | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index d7e64590f503..059cc18733bb 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -8,7 +8,6 @@ let cfg = config.services.redmine; ruby = pkgs.ruby; - rubyLibs = pkgs.rubyLibs; databaseYml = '' production: @@ -155,7 +154,7 @@ in { environment.HOME = "${pkgs.redmine}/share/redmine"; environment.REDMINE_LANG = "en"; environment.GEM_HOME = "${pkgs.redmine}/share/redmine/vendor/bundle/ruby/1.9.1"; - environment.GEM_PATH = "${rubyLibs.bundler}/lib/ruby/gems/1.9"; + environment.GEM_PATH = "${bundler}/${bundler.ruby.gemPath}"; path = with pkgs; [ imagemagickBig subversion diff --git a/nixos/modules/services/monitoring/riemann-dash.nix b/nixos/modules/services/monitoring/riemann-dash.nix index 148dc0468059..523f74cb72b9 100644 --- a/nixos/modules/services/monitoring/riemann-dash.nix +++ b/nixos/modules/services/monitoring/riemann-dash.nix @@ -15,7 +15,7 @@ let launcher = writeScriptBin "riemann-dash" '' #!/bin/sh - exec ${rubyLibs.riemann_dash}/bin/riemann-dash ${conf} + exec ${pkgs.riemann-dash}/bin/riemann-dash ${conf} ''; in { |