Use servicePath instead of relative paths.

svn path=/nixos/trunk/; revision=17454
This commit is contained in:
Nicolas Pierron 2009-09-26 23:04:43 +00:00
parent c5d45514a1
commit a701637f94
3 changed files with 7 additions and 6 deletions

View file

@ -1,4 +1,4 @@
{pkgs, config, ...}:
{servicesPath, pkgs, config, ...}:
###### interface
let
@ -84,6 +84,7 @@ let
but not a derivation.
";
};
private = mkOption {
default = "/var/elliptic-keys/private";
description = "
@ -100,7 +101,7 @@ in
let
cfg = config.services.gw6c;
procps = pkgs.procps;
gw6cService = import ../../../../services/gw6c {
gw6cService = import (servicesPath + /gw6c) {
inherit (pkgs) stdenv gw6c coreutils
procps upstart iputils gnused
gnugrep seccure writeScript;

View file

@ -1,4 +1,4 @@
{pkgs, config, ...}:
{servicesPath, pkgs, config, ...}:
###### interface
let
@ -84,7 +84,7 @@ in
let
cfg = config.services.ircdHybrid;
ircdService = import ../../../../services/ircd-hybrid {
ircdService = import (servicesPath + /ircd-hybrid) {
stdenv = pkgs.stdenv;
inherit (pkgs) ircdHybrid coreutils
su iproute gnugrep procps;

View file

@ -1,4 +1,4 @@
{pkgs, config, ...}:
{servicesPath, pkgs, config, ...}:
###### interface
let
@ -55,7 +55,7 @@ in
let
cfg = config.services.jboss;
jbossService = import ../../services/jboss {
jbossService = import (servicesPath + /jboss) {
inherit (pkgs) stdenv jboss su;
inherit (cfg) tempDir logDir libUrl deployDir serverDir user useJK;
};