public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pulseaudio: Use group audio instead of pulse-access

This commit is contained in:
Rickard Nilsson 2014-09-03 13:24:47 +02:00
parent ef5b30428f
commit 66ee6e03e7
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/config/pulseaudio.nix
View File

@ -146,13 +146,6 @@ in {
users.extraGroups.pulse.gid = gid; users.extraGroups.pulse.gid = gid;
users.extraGroups.pulse-access = {
gid = ids.gids.pulse-access;
members = with builtins; config.users.extraGroups.audio.members ++ (
attrNames(filterAttrs (n: u: elem "audio" u.extraGroups) config.users.extraUsers)
);
};
systemd.services.pulseaudio = { systemd.services.pulseaudio = {
description = "PulseAudio System-Wide Server"; description = "PulseAudio System-Wide Server";
wantedBy = [ "sound.target" ]; wantedBy = [ "sound.target" ];

1
nixos/modules/misc/ids.nix
View File

@ -271,7 +271,6 @@
riemann = 137; riemann = 137;
riemanndash = 138; riemanndash = 138;
uhub = 142; uhub = 142;
pulse-access = 143;
# When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399! # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399!

13
pkgs/servers/pulseaudio/default.nix
View File

@ -45,10 +45,15 @@ stdenv.mkDerivation rec {
-e "s|chmod r+s |true |" -e "s|chmod r+s |true |"
''; '';
configureFlags = configureFlags = [
[ "--disable-solaris" "--disable-jack" "--disable-oss-output" "--disable-solaris"
"--disable-oss-wrapper" "--localstatedir=/var" "--sysconfdir=/etc" ] "--disable-jack"
++ stdenv.lib.optional jackaudioSupport "--enable-jack" "--disable-oss-output"
"--disable-oss-wrapper"
"--localstatedir=/var"
"--sysconfdir=/etc"
"--with-access-group=audio"
] ++ stdenv.lib.optional jackaudioSupport "--enable-jack"
++ stdenv.lib.optional stdenv.isDarwin "--with-mac-sysroot=/"; ++ stdenv.lib.optional stdenv.isDarwin "--with-mac-sysroot=/";
enableParallelBuilding = true; enableParallelBuilding = true;