diff options
| author | Sandro Jäckel <sandro.jaeckel@sap.com> | 2021-11-03 13:43:23 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-11-03 14:43:52 +0100 |
| commit | 8547db919a05c86fe724b972b3130f305d6f4267 (patch) | |
| tree | e32513b8699ad0fc393245b6528d867065787b01 /nixos/modules/services/desktops | |
| parent | c463cb880c4e85e116192d1e4a1c9bdf0072da1d (diff) | |
| download | nixpkgs-8547db919a05c86fe724b972b3130f305d6f4267.tar nixpkgs-8547db919a05c86fe724b972b3130f305d6f4267.tar.gz nixpkgs-8547db919a05c86fe724b972b3130f305d6f4267.tar.bz2 nixpkgs-8547db919a05c86fe724b972b3130f305d6f4267.tar.lz nixpkgs-8547db919a05c86fe724b972b3130f305d6f4267.tar.xz nixpkgs-8547db919a05c86fe724b972b3130f305d6f4267.tar.zst nixpkgs-8547db919a05c86fe724b972b3130f305d6f4267.zip | |
treewide: switch ``builtins.fromJSON(builtins.readFile ./file.json)`` to lib.importJSON ./file.json
Diffstat (limited to 'nixos/modules/services/desktops')
| -rw-r--r-- | nixos/modules/services/desktops/pipewire/pipewire-media-session.nix | 8 | ||||
| -rw-r--r-- | nixos/modules/services/desktops/pipewire/pipewire.nix | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix index 8f6c4fa1d4f..4be3e881a9d 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 ./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)); + alsa-monitor = lib.importJSON ./media-session/alsa-monitor.conf.json; + bluez-monitor = lib.importJSON ./media-session/bluez-monitor.conf.json; + media-session = lib.importJSON ./media-session/media-session.conf.json; + v4l2-monitor = lib.importJSON ./media-session/v4l2-monitor.conf.json; }; configs = { diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index 273d518033d..55755ecd645 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -22,11 +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 ./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); + client = lib.importJSON ./daemon/client.conf.json; + client-rt = lib.importJSON ./daemon/client-rt.conf.json; + jack = lib.importJSON ./daemon/jack.conf.json; + pipewire = lib.importJSON ./daemon/pipewire.conf.json; + pipewire-pulse = lib.importJSON ./daemon/pipewire-pulse.conf.json; }; configs = { |