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

Updated disnix to latest 0.3 release

Browse Source
This commit is contained in:
Sander van der Burg 2013-06-27 15:32:49 +02:00
parent eb110fd3ce
commit 5dd0ce8c15
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/services/misc/disnix.nix
View File

@ -7,7 +7,7 @@ let
cfg = config.services.disnix; cfg = config.services.disnix;
disnix_activation_scripts = pkgs.disnix_activation_scripts.override (origArgs: { dysnomia = pkgs.dysnomia.override (origArgs: {
enableApacheWebApplication = config.services.httpd.enable; enableApacheWebApplication = config.services.httpd.enable;
enableAxis2WebService = config.services.tomcat.axis2.enable; enableAxis2WebService = config.services.tomcat.axis2.enable;
enableEjabberdDump = config.services.ejabberd.enable; enableEjabberdDump = config.services.ejabberd.enable;
@ -95,7 +95,7 @@ in
name = "supportedtypes"; name = "supportedtypes";
buildCommand = '' buildCommand = ''
( echo -n "[ " ( echo -n "[ "
cd ${disnix_activation_scripts}/libexec/disnix/activation-scripts cd ${dysnomia}/libexec/dysnomia
for i in * for i in *
do do
echo -n "\"$i\" " echo -n "\"$i\" "
@ -129,12 +129,12 @@ in
restartIfChanged = false; restartIfChanged = false;
path = [ pkgs.nix pkgs.disnix ];
script = script =
'' ''
export PATH=/run/current-system/sw/bin:/run/current-system/sw/sbin
export HOME=/root export HOME=/root
disnix-service --dysnomia-modules-dir=${dysnomia}/libexec/dysnomia
${pkgs.disnix}/bin/disnix-service --activation-modules-dir=${disnix_activation_scripts}/libexec/disnix/activation-scripts
''; '';
}; };
} // optionalAttrs cfg.publishAvahi { } // optionalAttrs cfg.publishAvahi {