From 0e2c82c3419be9f20e6742d036653cc8c58d6500 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 28 Nov 2024 23:04:18 +0100 Subject: [PATCH] nixos/freshrss: fix empty extensions --- nixos/modules/services/web-apps/freshrss.nix | 1 + pkgs/servers/web-apps/freshrss/default.nix | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix index 0e8bcc703efa..d67d927ba5ee 100644 --- a/nixos/modules/services/web-apps/freshrss.nix +++ b/nixos/modules/services/web-apps/freshrss.nix @@ -10,6 +10,7 @@ let }; env-vars = { DATA_PATH = cfg.dataDir; + } // lib.optionalAttrs (cfg.extensions != []) { THIRDPARTY_EXTENSIONS_PATH = "${extension-env}/share/freshrss/"; }; in diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index e963b22fa302..99b4f7b2409a 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -21,10 +21,13 @@ stdenvNoCC.mkDerivation rec { patchShebangs cli/*.php app/actualize_script.php ''; - # the thirdparty_extension_path can only be set by config, but should be read by an env-var. + # THIRDPARTY_EXTENSIONS_PATH can only be set by config, but should be read from an env-var. overrideConfig = writeText "constants.local.php" ''