diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-10-31 15:32:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-31 15:32:20 +0100 |
commit | ef02a97f27e502e9bedb9871ef8aec00417f9bf0 (patch) | |
tree | 4645c909a6dff393fed2d884ce866d0088d1a486 /nixos/modules | |
parent | e6351a0f88f8945b00fa3f593858e901e956ceaf (diff) | |
parent | b3bcf51c05aa4a1929d623cf01722a271da74888 (diff) |
Merge pull request #142865 from jansol/master
pipewire: 0.3.38 -> 0.3.39
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json (renamed from nixos/modules/services/desktops/pipewire/client-rt.conf.json) | 0 | ||||
-rw-r--r-- | nixos/modules/services/desktops/pipewire/daemon/client.conf.json (renamed from nixos/modules/services/desktops/pipewire/client.conf.json) | 0 | ||||
-rw-r--r-- | nixos/modules/services/desktops/pipewire/daemon/jack.conf.json (renamed from nixos/modules/services/desktops/pipewire/jack.conf.json) | 0 | ||||
-rw-r--r-- | nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json (renamed from nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json) | 0 | ||||
-rw-r--r-- | nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json (renamed from nixos/modules/services/desktops/pipewire/pipewire.conf.json) | 0 | ||||
-rw-r--r-- | nixos/modules/services/desktops/pipewire/media-session/alsa-monitor.conf.json (renamed from nixos/modules/services/desktops/pipewire/alsa-monitor.conf.json) | 0 | ||||
-rw-r--r-- | nixos/modules/services/desktops/pipewire/media-session/bluez-monitor.conf.json (renamed from nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json) | 0 | ||||
-rw-r--r-- | nixos/modules/services/desktops/pipewire/media-session/media-session.conf.json (renamed from nixos/modules/services/desktops/pipewire/media-session.conf.json) | 0 | ||||
-rw-r--r-- | nixos/modules/services/desktops/pipewire/media-session/v4l2-monitor.conf.json (renamed from nixos/modules/services/desktops/pipewire/v4l2-monitor.conf.json) | 0 | ||||
-rw-r--r-- | nixos/modules/services/desktops/pipewire/pipewire-media-session.nix | 20 | ||||
-rw-r--r-- | nixos/modules/services/desktops/pipewire/pipewire.nix | 11 |
11 files changed, 15 insertions, 16 deletions
diff --git a/nixos/modules/services/desktops/pipewire/client-rt.conf.json b/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json index 284d8c394a611..284d8c394a611 100644 --- a/nixos/modules/services/desktops/pipewire/client-rt.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json diff --git a/nixos/modules/services/desktops/pipewire/client.conf.json b/nixos/modules/services/desktops/pipewire/daemon/client.conf.json index 71294a0e78a2d..71294a0e78a2d 100644 --- a/nixos/modules/services/desktops/pipewire/client.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/client.conf.json diff --git a/nixos/modules/services/desktops/pipewire/jack.conf.json b/nixos/modules/services/desktops/pipewire/daemon/jack.conf.json index 128178bfa027f..128178bfa027f 100644 --- a/nixos/modules/services/desktops/pipewire/jack.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/jack.conf.json diff --git a/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json b/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json index 3ed994f111458..3ed994f111458 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json diff --git a/nixos/modules/services/desktops/pipewire/pipewire.conf.json b/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json index a923ab4db2357..a923ab4db2357 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json diff --git a/nixos/modules/services/desktops/pipewire/alsa-monitor.conf.json b/nixos/modules/services/desktops/pipewire/media-session/alsa-monitor.conf.json index 53fc9cc96343b..53fc9cc96343b 100644 --- a/nixos/modules/services/desktops/pipewire/alsa-monitor.conf.json +++ b/nixos/modules/services/desktops/pipewire/media-session/alsa-monitor.conf.json diff --git a/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json b/nixos/modules/services/desktops/pipewire/media-session/bluez-monitor.conf.json index 6d1c23e825699..6d1c23e825699 100644 --- a/nixos/modules/services/desktops/pipewire/bluez-monitor.conf.json +++ b/nixos/modules/services/desktops/pipewire/media-session/bluez-monitor.conf.json diff --git a/nixos/modules/services/desktops/pipewire/media-session.conf.json b/nixos/modules/services/desktops/pipewire/media-session/media-session.conf.json index 4b4e302af3876..4b4e302af3876 100644 --- a/nixos/modules/services/desktops/pipewire/media-session.conf.json +++ b/nixos/modules/services/desktops/pipewire/media-session/media-session.conf.json diff --git a/nixos/modules/services/desktops/pipewire/v4l2-monitor.conf.json b/nixos/modules/services/desktops/pipewire/media-session/v4l2-monitor.conf.json index b08cba1b604b5..b08cba1b604b5 100644 --- a/nixos/modules/services/desktops/pipewire/v4l2-monitor.conf.json +++ b/nixos/modules/services/desktops/pipewire/media-session/v4l2-monitor.conf.json diff --git a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix index 4ae6aab29cdba..8f6c4fa1d4f6e 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix @@ -13,10 +13,10 @@ let # Use upstream config files passed through spa-json-dump as the base # Patched here as necessary for them to work with this module defaults = { - alsa-monitor = (builtins.fromJSON (builtins.readFile ./alsa-monitor.conf.json)); - bluez-monitor = (builtins.fromJSON (builtins.readFile ./bluez-monitor.conf.json)); - media-session = (builtins.fromJSON (builtins.readFile ./media-session.conf.json)); - v4l2-monitor = (builtins.fromJSON (builtins.readFile ./v4l2-monitor.conf.json)); + alsa-monitor = (builtins.fromJSON (builtins.readFile ./media-session/alsa-monitor.conf.json)); + bluez-monitor = (builtins.fromJSON (builtins.readFile ./media-session/bluez-monitor.conf.json)); + media-session = (builtins.fromJSON (builtins.readFile ./media-session/media-session.conf.json)); + v4l2-monitor = (builtins.fromJSON (builtins.readFile ./media-session/v4l2-monitor.conf.json)); }; configs = { @@ -43,8 +43,8 @@ in { package = mkOption { type = types.package; - default = pkgs.pipewire.mediaSession; - defaultText = literalExpression "pkgs.pipewire.mediaSession"; + default = pkgs.pipewire-media-session; + defaultText = literalExpression "pkgs.pipewire-media-session"; description = '' The pipewire-media-session derivation to use. ''; @@ -55,7 +55,7 @@ in { type = json.type; description = '' Configuration for the media session core. For details see - https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/media-session.conf + https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/media-session.conf ''; default = {}; }; @@ -64,7 +64,7 @@ in { type = json.type; description = '' Configuration for the alsa monitor. For details see - https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/alsa-monitor.conf + https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/alsa-monitor.conf ''; default = {}; }; @@ -73,7 +73,7 @@ in { type = json.type; description = '' Configuration for the bluez5 monitor. For details see - https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/bluez-monitor.conf + https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/bluez-monitor.conf ''; default = {}; }; @@ -82,7 +82,7 @@ in { type = json.type; description = '' Configuration for the V4L2 monitor. For details see - https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/v4l2-monitor.conf + https://gitlab.freedesktop.org/pipewire/media-session/-/blob/${cfg.package.version}/src/daemon/media-session.d/v4l2-monitor.conf ''; default = {}; }; diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index 604645b2b18a3..273d518033db0 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -22,12 +22,11 @@ let # Use upstream config files passed through spa-json-dump as the base # Patched here as necessary for them to work with this module defaults = { - client = builtins.fromJSON (builtins.readFile ./client.conf.json); - client-rt = builtins.fromJSON (builtins.readFile ./client-rt.conf.json); - jack = builtins.fromJSON (builtins.readFile ./jack.conf.json); - # Remove session manager invocation from the upstream generated file, it points to the wrong path - pipewire = builtins.fromJSON (builtins.readFile ./pipewire.conf.json); - pipewire-pulse = builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json); + client = builtins.fromJSON (builtins.readFile ./daemon/client.conf.json); + client-rt = builtins.fromJSON (builtins.readFile ./daemon/client-rt.conf.json); + jack = builtins.fromJSON (builtins.readFile ./daemon/jack.conf.json); + pipewire = builtins.fromJSON (builtins.readFile ./daemon/pipewire.conf.json); + pipewire-pulse = builtins.fromJSON (builtins.readFile ./daemon/pipewire-pulse.conf.json); }; configs = { |