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 /pkgs/applications/networking/instant-messengers/element | |
| parent | c463cb880c4e85e116192d1e4a1c9bdf0072da1d (diff) | |
treewide: switch ``builtins.fromJSON(builtins.readFile ./file.json)`` to lib.importJSON ./file.json
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/element')
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index dd7c6f0c573ed..bce13052e5ac4 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -16,7 +16,7 @@ }: let - pinData = (builtins.fromJSON (builtins.readFile ./pin.json)); + pinData = lib.importJSON ./pin.json; executableName = "element-desktop"; electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; in diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 33af19a9a5766..fae96e8e5e7ae 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, jq, conf ? {} }: let - pinData = (builtins.fromJSON (builtins.readFile ./pin.json)); + pinData = lib.importJSON ./pin.json; noPhoningHome = { disable_guests = true; # disable automatic guest account registration at matrix.org piwik = false; # disable analytics diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix index 432d69ac7a47e..ae9627afe30d6 100644 --- a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix @@ -2,7 +2,7 @@ , fixup_yarn_lock, yarn, pkg-config, libsecret, xcbuild, Security, AppKit, fetchYarnDeps }: let - pinData = (builtins.fromJSON (builtins.readFile ./pin.json)); + pinData = lib.importJSON ./pin.json; in stdenv.mkDerivation rec { pname = "keytar"; diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix index ff3b2ba9134d1..de38c7a90bad0 100644 --- a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock, CoreServices, fetchYarnDeps }: let - pinData = (builtins.fromJSON (builtins.readFile ./pin.json)); + pinData = lib.importJSON ./pin.json; in rustPlatform.buildRustPackage rec { pname = "seshat-node"; |