summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorLassulus <github@lassul.us>2022-04-18 19:55:31 +0100
committerGitHub <noreply@github.com>2022-04-18 19:55:31 +0100
commitcae8c76a9ba9a13d4ae409617bf5b52f2f6960f7 (patch)
treea0012dbb178278be2349829c196b86e6c8653b83 /nixos
parent64512ac0eff1bd015f24caa03803f6c192ca943a (diff)
parent54f2cde947c5c9262979646d6fa3b69ed6152d98 (diff)
downloadnixpkgs-cae8c76a9ba9a13d4ae409617bf5b52f2f6960f7.tar
nixpkgs-cae8c76a9ba9a13d4ae409617bf5b52f2f6960f7.tar.gz
nixpkgs-cae8c76a9ba9a13d4ae409617bf5b52f2f6960f7.tar.bz2
nixpkgs-cae8c76a9ba9a13d4ae409617bf5b52f2f6960f7.tar.lz
nixpkgs-cae8c76a9ba9a13d4ae409617bf5b52f2f6960f7.tar.xz
nixpkgs-cae8c76a9ba9a13d4ae409617bf5b52f2f6960f7.tar.zst
nixpkgs-cae8c76a9ba9a13d4ae409617bf5b52f2f6960f7.zip
Merge pull request #163130 from xlambein/master
pipewire-media-session: changed options to take defaults from JSON
Diffstat (limited to 'nixos')
-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 6027e4f3d4b..09761d6300e 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;
         };
       };
     };