diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 13:33:13 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 13:33:37 +0200 |
| commit | 5227fb1dd53fcb5918b9342dff4868f4ad68427e (patch) | |
| tree | d6cd521e3f67944031216a27f740f28f22b73b41 /nixos/modules/services/system | |
| parent | d6dd3b8bd1eaeeb21dfdb5051cd4732c748ce5d7 (diff) | |
| parent | 33373d939a19f465228ddede6d38ce9032b5916b (diff) | |
| download | nixlib-5227fb1dd53fcb5918b9342dff4868f4ad68427e.tar nixlib-5227fb1dd53fcb5918b9342dff4868f4ad68427e.tar.gz nixlib-5227fb1dd53fcb5918b9342dff4868f4ad68427e.tar.bz2 nixlib-5227fb1dd53fcb5918b9342dff4868f4ad68427e.tar.lz nixlib-5227fb1dd53fcb5918b9342dff4868f4ad68427e.tar.xz nixlib-5227fb1dd53fcb5918b9342dff4868f4ad68427e.tar.zst nixlib-5227fb1dd53fcb5918b9342dff4868f4ad68427e.zip | |
Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
Diffstat (limited to 'nixos/modules/services/system')
| -rw-r--r-- | nixos/modules/services/system/dbus.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/system/nscd.nix | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 853b458cf589..77427ce9606e 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -12,7 +12,10 @@ let configDir = pkgs.stdenv.mkDerivation { name = "dbus-conf"; + preferLocalBuild = true; + allowSubstitutes = false; + buildCommand = '' mkdir -p $out @@ -70,6 +73,7 @@ in enable = mkOption { type = types.bool; default = true; + internal = true; description = '' Whether to start the D-Bus message bus daemon, which is required by many other system services and applications. diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index 59ba12bcc175..d98ef8a306d5 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -42,7 +42,10 @@ in config = mkIf cfg.enable { - users.extraUsers.nscd.description = "Name service cache daemon user"; + users.extraUsers.nscd = + { isSystemUser = true; + description = "Name service cache daemon user"; + }; systemd.services.nscd = { description = "Name Service Cache Daemon"; |