summary refs log tree commit diff
path: root/nixos/modules/config
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-07-25 12:47:13 +0000
committerRobin Gloster <mail@glob.in>2016-07-25 12:47:13 +0000
commitf222d9874643197fb61ca8460449f10abae1a4fd (patch)
treeb8b9c2dcdf54cc418ef54d579b7d21e0830006b8 /nixos/modules/config
parent1f04b4a566d3c8f8de5354ed09dee46557c4abe3 (diff)
parente725c927d4a09ee116fe18f2f0718364678a321f (diff)
downloadnixpkgs-f222d9874643197fb61ca8460449f10abae1a4fd.tar
nixpkgs-f222d9874643197fb61ca8460449f10abae1a4fd.tar.gz
nixpkgs-f222d9874643197fb61ca8460449f10abae1a4fd.tar.bz2
nixpkgs-f222d9874643197fb61ca8460449f10abae1a4fd.tar.lz
nixpkgs-f222d9874643197fb61ca8460449f10abae1a4fd.tar.xz
nixpkgs-f222d9874643197fb61ca8460449f10abae1a4fd.tar.zst
nixpkgs-f222d9874643197fb61ca8460449f10abae1a4fd.zip
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'nixos/modules/config')
-rw-r--r--nixos/modules/config/pulseaudio.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index 6984e85603f..7acf050a9a4 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -27,6 +27,7 @@ let
   clientConf = writeText "client.conf" ''
     autospawn=${if nonSystemWide then "yes" else "no"}
     ${optionalString nonSystemWide "daemon-binary=${cfg.package.out}/bin/pulseaudio"}
+    ${cfg.extraClientConf}
   '';
 
   # Write an /etc/asound.conf that causes all ALSA applications to
@@ -96,6 +97,14 @@ in {
         '';
       };
 
+      extraClientConf = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          Extra configuration appended to pulse/client.conf file.
+        '';
+      };
+
       package = mkOption {
         type = types.package;
         default = pulseaudioLight;