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

* Allow the PulseAudio server to be overriden.

Browse Source 
svn path=/nixos/trunk/; revision=28112
This commit is contained in:
Eelco Dolstra 2011-08-01 13:26:51 +00:00
parent 44725e50f0
commit 7a7d781e6a
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/config/pulseaudio.nix
View File

@ -15,13 +15,23 @@ let cfg = config.hardware.pulseaudio; in
''; '';
}; };
hardware.pulseaudio.package = mkOption {
default = pkgs.pulseaudio;
example = "pkgs.pulseaudio.override { jackaudioSupport = true; }";
description = ''
The PulseAudio derivation to use. This can be used to enable
features (such as JACK support) that are not enabled in the
default PulseAudio in Nixpkgs.
'';
};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = environment.systemPackages =
[ pkgs.pulseaudio ]; [ cfg.package ];
environment.etc = mkAlways ( environment.etc = mkAlways (
[ # Create pulse/client.conf even if PulseAudio is disabled so [ # Create pulse/client.conf even if PulseAudio is disabled so
@ -31,6 +41,9 @@ let cfg = config.hardware.pulseaudio; in
source = pkgs.writeText "client.conf" source = pkgs.writeText "client.conf"
'' ''
autospawn=${if cfg.enable then "yes" else "no"} autospawn=${if cfg.enable then "yes" else "no"}
${optionalString cfg.enable ''
daemon-binary=${cfg.package}/bin/pulseaudio
''}
''; '';
} }
@ -61,11 +74,11 @@ let cfg = config.hardware.pulseaudio; in
} }
{ target = "pulse/default.pa"; { target = "pulse/default.pa";
source = "${pkgs.pulseaudio}/etc/pulse/default.pa"; source = "${cfg.package}/etc/pulse/default.pa";
} }
{ target = "pulse/system.pa"; { target = "pulse/system.pa";
source = "${pkgs.pulseaudio}/etc/pulse/system.pa"; source = "${cfg.package}/etc/pulse/system.pa";
} }
]); ]);