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

Added possibility to use names instead of full paths in httpd subservices. Yes, the same dirty hack again

Browse Source 
svn path=/nixos/trunk/; revision=11615
This commit is contained in:
Michael Raskin 2008-04-13 09:35:18 +00:00
parent 5e1ee10f3c
commit 02decddeb1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
upstart-jobs/apache-httpd/default.nix
View File

@ -45,8 +45,11 @@ let
callSubservices = serverInfo: defs: callSubservices = serverInfo: defs:
let f = svc: let f = svc:
let config = addDefaultOptionValues res.options svc.config; let
res = svc.function {inherit config pkgs serverInfo;}; svcFunction = if svc ? function then
svc.function else (import ( ./noDir/.. + ("/" + svc.serviceName + ".nix")));
config = addDefaultOptionValues res.options svc.config;
res = svcFunction {inherit config pkgs serverInfo;};
in res; in res;
in map f defs; in map f defs;