summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorxlambein <xlambein@gmail.com>2022-03-07 10:44:08 +0100
committerxlambein <xlambein@gmail.com>2022-03-07 11:25:12 +0100
commit54f2cde947c5c9262979646d6fa3b69ed6152d98 (patch)
tree2692ecfed5455f420aef4c7ec648d55ec05b6734 /nixos/modules
parent94342fb23b22aaf02ca4e88fa673f6063c87cdd8 (diff)
downloadnixpkgs-54f2cde947c5c9262979646d6fa3b69ed6152d98.tar
nixpkgs-54f2cde947c5c9262979646d6fa3b69ed6152d98.tar.gz
nixpkgs-54f2cde947c5c9262979646d6fa3b69ed6152d98.tar.bz2
nixpkgs-54f2cde947c5c9262979646d6fa3b69ed6152d98.tar.lz
nixpkgs-54f2cde947c5c9262979646d6fa3b69ed6152d98.tar.xz
nixpkgs-54f2cde947c5c9262979646d6fa3b69ed6152d98.tar.zst
nixpkgs-54f2cde947c5c9262979646d6fa3b69ed6152d98.zip
pipewire-media-session: changed options to take defaults from JSON
Currently, default options for media-session are empty, making it harder
to adapt them without fully overwriting them.  This commit sets these
defaults to the content of the JSON files provided with media-session.
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/desktops/pipewire/pipewire-media-session.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
index 109c91134b9..e61c06e66ec 100644
--- a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
+++ b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
@@ -58,7 +58,7 @@ in {
             Configuration for the media session core. For details see
             https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/media-session.conf
           '';
-          default = {};
+          default = defaults.media-session;
         };
 
         alsa-monitor = mkOption {
@@ -67,7 +67,7 @@ in {
             Configuration for the alsa monitor. For details see
             https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/alsa-monitor.conf
           '';
-          default = {};
+          default = defaults.alsa-monitor;
         };
 
         bluez-monitor = mkOption {
@@ -76,7 +76,7 @@ in {
             Configuration for the bluez5 monitor. For details see
             https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/bluez-monitor.conf
           '';
-          default = {};
+          default = defaults.bluez-monitor;
         };
 
         v4l2-monitor = mkOption {
@@ -85,7 +85,7 @@ in {
             Configuration for the V4L2 monitor. For details see
             https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/v4l2-monitor.conf
           '';
-          default = {};
+          default = defaults.v4l2-monitor;
         };
       };
     };