diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-07 20:06:22 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-07 20:06:22 +0100 |
commit | a823616723c44700a1c976fee77aafb470388e19 (patch) | |
tree | 08c996bb7f020cda3aa27ef881b61b0d3807b383 /nixos/modules/services/networking/mjpg-streamer.nix | |
parent | 7f8111955082b4aa7dce2718b9ef4d8ad0f4584b (diff) | |
parent | c425a7e694ef48513e35b60a124587ef382b2fa6 (diff) | |
download | nixpkgs-a823616723c44700a1c976fee77aafb470388e19.tar nixpkgs-a823616723c44700a1c976fee77aafb470388e19.tar.gz nixpkgs-a823616723c44700a1c976fee77aafb470388e19.tar.bz2 nixpkgs-a823616723c44700a1c976fee77aafb470388e19.tar.lz nixpkgs-a823616723c44700a1c976fee77aafb470388e19.tar.xz nixpkgs-a823616723c44700a1c976fee77aafb470388e19.tar.zst nixpkgs-a823616723c44700a1c976fee77aafb470388e19.zip |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/services/networking/mjpg-streamer.nix')
-rw-r--r-- | nixos/modules/services/networking/mjpg-streamer.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/services/networking/mjpg-streamer.nix b/nixos/modules/services/networking/mjpg-streamer.nix index e0a6c112e3c..dbc35e2e71c 100644 --- a/nixos/modules/services/networking/mjpg-streamer.nix +++ b/nixos/modules/services/networking/mjpg-streamer.nix @@ -49,10 +49,11 @@ in { config = mkIf cfg.enable { - users.users = optional (cfg.user == "mjpg-streamer") { - name = "mjpg-streamer"; - uid = config.ids.uids.mjpg-streamer; - group = cfg.group; + users.users = optionalAttrs (cfg.user == "mjpg-streamer") { + mjpg-streamer = { + uid = config.ids.uids.mjpg-streamer; + group = cfg.group; + }; }; systemd.services.mjpg-streamer = { |