mirror of
https://github.com/LnL7/nix-darwin.git
synced 2025-03-06 08:47:00 +00:00
nix-daemon: remove services.nix-daemon.enable
We now manage the launchd daemon unconditionally when we manage the Nix installation.
This commit is contained in:
parent
adc989f7ec
commit
8a94b5b99b
3 changed files with 9 additions and 10 deletions
|
@ -3,17 +3,18 @@
|
|||
let
|
||||
cfg = config.services.nix-daemon;
|
||||
|
||||
inherit (lib) mkDefault mkIf mkMerge mkOption types;
|
||||
inherit (lib) mkRemovedOptionModule mkDefault mkIf mkMerge mkOption types;
|
||||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
services.nix-daemon.enable = mkOption {
|
||||
type = types.bool;
|
||||
default = config.nix.enable;
|
||||
description = "Whether to enable the nix-daemon service.";
|
||||
};
|
||||
imports = [
|
||||
(mkRemovedOptionModule [ "services" "nix-daemon" "enable" ] ''
|
||||
nix-darwin now manages nix-daemon unconditionally when
|
||||
`nix.enable` is on.
|
||||
'')
|
||||
];
|
||||
|
||||
options = {
|
||||
services.nix-daemon.enableSocketListener = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
|
@ -39,7 +40,7 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
config = mkIf config.nix.enable {
|
||||
|
||||
launchd.daemons.nix-daemon = {
|
||||
command = lib.getExe' config.nix.package "nix-daemon";
|
||||
|
|
|
@ -6,7 +6,6 @@ let
|
|||
in
|
||||
|
||||
{
|
||||
services.nix-daemon.enable = true;
|
||||
nix.package = nix;
|
||||
launchd.labelPrefix = "org.nix-darwin"; # should not have an effect on nix-daemon
|
||||
|
||||
|
|
|
@ -5,7 +5,6 @@ let
|
|||
in
|
||||
|
||||
{
|
||||
services.nix-daemon.enable = true;
|
||||
services.nix-daemon.enableSocketListener = true;
|
||||
nix.package = nix;
|
||||
launchd.labelPrefix = "org.nix-darwin"; # should not have an effect on nix-daemon
|
||||
|
|
Loading…
Add table
Reference in a new issue