From a701637f9431f536f23d4df2ec55b5137a01fe8a Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sat, 26 Sep 2009 23:04:43 +0000
Subject: [PATCH] Use servicePath instead of relative paths.

svn path=/nixos/trunk/; revision=17454
---
 modules/services/networking/gw6c.nix        | 5 +++--
 modules/services/networking/ircd-hybrid.nix | 4 ++--
 modules/services/web-servers/jboss.nix      | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/services/networking/gw6c.nix b/modules/services/networking/gw6c.nix
index 2fbd266b7009..502a7b1826e7 100644
--- a/modules/services/networking/gw6c.nix
+++ b/modules/services/networking/gw6c.nix
@@ -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;
diff --git a/modules/services/networking/ircd-hybrid.nix b/modules/services/networking/ircd-hybrid.nix
index 5b098ef69046..070abc1ef229 100644
--- a/modules/services/networking/ircd-hybrid.nix
+++ b/modules/services/networking/ircd-hybrid.nix
@@ -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;
diff --git a/modules/services/web-servers/jboss.nix b/modules/services/web-servers/jboss.nix
index 322ed92b920d..9ead3e11e9bf 100644
--- a/modules/services/web-servers/jboss.nix
+++ b/modules/services/web-servers/jboss.nix
@@ -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;
 };