* Tabs considered harmful.
svn path=/nixos/trunk/; revision=12407
This commit is contained in:
parent
cc902c638c
commit
5ec1fa2060
@ -340,7 +340,6 @@ rec {
|
||||
chown ${entry.owner}.${entry.group} $wrapperDir/${entry.program}
|
||||
chmod u${if entry.setuid then "+" else "-"}s $wrapperDir/${entry.program}
|
||||
chmod g${if entry.setgid then "+" else "-"}s $wrapperDir/${entry.program}
|
||||
|
||||
'')
|
||||
config.security.setuidOwners);
|
||||
};
|
||||
|
@ -349,9 +349,9 @@ let
|
||||
(import ../upstart-jobs/dbus.nix {
|
||||
inherit (pkgs) stdenv dbus;
|
||||
dbusServices =
|
||||
pkgs.lib.optional (config.services.hal.enable) pkgs.hal ++
|
||||
pkgs.lib.optional (config.services.avahi.enable) pkgs.avahi ++
|
||||
pkgs.lib.optional (config.services.disnix.enable) pkgs.disnix
|
||||
pkgs.lib.optional config.services.hal.enable pkgs.hal ++
|
||||
pkgs.lib.optional config.services.avahi.enable pkgs.avahi ++
|
||||
pkgs.lib.optional config.services.disnix.enable pkgs.disnix
|
||||
;
|
||||
})
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user