diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-09-06 16:51:14 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-09-06 16:52:45 +0200 |
| commit | 06fea81c6e3d71689b59df6e2bbc11fe01ce9056 (patch) | |
| tree | 5849b904bf1eb3bc8cb28b29729d83a4d0337542 /nixos/modules/config | |
| parent | 20be024d1bae622409fa56844b2f8799bbf29bb0 (diff) | |
| parent | 0c398f60405090743fbdcf14faf1193c642b6328 (diff) | |
| download | nixlib-06fea81c6e3d71689b59df6e2bbc11fe01ce9056.tar nixlib-06fea81c6e3d71689b59df6e2bbc11fe01ce9056.tar.gz nixlib-06fea81c6e3d71689b59df6e2bbc11fe01ce9056.tar.bz2 nixlib-06fea81c6e3d71689b59df6e2bbc11fe01ce9056.tar.lz nixlib-06fea81c6e3d71689b59df6e2bbc11fe01ce9056.tar.xz nixlib-06fea81c6e3d71689b59df6e2bbc11fe01ce9056.tar.zst nixlib-06fea81c6e3d71689b59df6e2bbc11fe01ce9056.zip | |
Merge recent master into staging
Hydra: ?compare=1150594
Diffstat (limited to 'nixos/modules/config')
| -rw-r--r-- | nixos/modules/config/pulseaudio.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 1b84bbaf10c5..fb5715022b78 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -10,10 +10,12 @@ let systemWide = cfg.enable && cfg.systemWide; nonSystemWide = cfg.enable && !cfg.systemWide; - uid = config.ids.uids.pulseaudio; - gid = config.ids.gids.pulseaudio; + ids = config.ids; - stateDir = "/run/pulse"; + uid = ids.uids.pulseaudio; + gid = ids.gids.pulseaudio; + + stateDir = "/var/run/pulse"; # Create pulse/client.conf even if PulseAudio is disabled so # that we can disable the autospawn feature in programs that @@ -138,6 +140,8 @@ in { group = "pulse"; extraGroups = [ "audio" ]; description = "PulseAudio system service user"; + home = stateDir; + createHome = true; }; users.extraGroups.pulse.gid = gid; @@ -147,10 +151,6 @@ in { wantedBy = [ "sound.target" ]; before = [ "sound.target" ]; environment.PULSE_RUNTIME_PATH = stateDir; - preStart = '' - mkdir -p --mode 755 ${stateDir} - chown -R pulse:pulse ${stateDir} - ''; serviceConfig = { ExecStart = "${cfg.package}/bin/pulseaudio -D --log-level=${cfg.daemon.logLevel} --system --use-pid-file -n --file=${cfg.configFile}"; PIDFile = "${stateDir}/pid"; |