From 61fb3c6163bde5be458c97cd735ed344ea2b1fd2 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 27 Dec 2025 01:01:16 +0200 Subject: [PATCH] element-web: use explicit default values, remove override in all-packages.nix --- pkgs/by-name/el/element-web/package.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/el/element-web/package.nix b/pkgs/by-name/el/element-web/package.nix index a5dbaf77b7b46..a469750f50dd7 100644 --- a/pkgs/by-name/el/element-web/package.nix +++ b/pkgs/by-name/el/element-web/package.nix @@ -3,7 +3,8 @@ stdenv, jq, element-web-unwrapped, - conf ? { }, + config, + conf ? config.element-web.conf or { }, }: if (conf == { }) then diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ab11ab150709..a303c2f695f66 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1796,10 +1796,6 @@ with pkgs; easyocr = with python3.pkgs; toPythonApplication easyocr; - element-web = callPackage ../by-name/el/element-web/package.nix { - conf = config.element-web.conf or { }; - }; - espanso-wayland = espanso.override { x11Support = false; waylandSupport = !stdenv.hostPlatform.isDarwin;