public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use servicePath instead of relative paths.

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/services/networking/gw6c.nix
View File

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

4
modules/services/networking/ircd-hybrid.nix
View File

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

4
modules/services/web-servers/jboss.nix
View File

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