diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix index 839769d028d..f804240a50b 100644 --- a/upstart-jobs/default.nix +++ b/upstart-jobs/default.nix @@ -363,6 +363,7 @@ let ++ optional config.services.hal.enable (import ../upstart-jobs/hal.nix { inherit (pkgs) stdenv hal; + inherit config; }) ++ optional config.services.gpm.enable diff --git a/upstart-jobs/hal.nix b/upstart-jobs/hal.nix index 0fa47bf5eeb..8b59c079eb8 100644 --- a/upstart-jobs/hal.nix +++ b/upstart-jobs/hal.nix @@ -1,4 +1,4 @@ -{stdenv, hal}: +{stdenv, hal, config}: { name = "hal"; @@ -23,7 +23,7 @@ # !!! TODO: make sure that HAL starts after acpid, # otherwise hald-addon-acpi will grab /proc/acpi/event. - start on dbus + start on ${if config.powerManagement.enable then "acpid" else "dbus"} stop on shutdown start script