From a044d5707a3e6733c90f1c184ff94e900a87cea3 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 31 May 2025 17:54:25 +0200 Subject: [PATCH] fix(ente-auth): remove build flag from ente-web-auth package Move the build flag from the package to the module, that way everyone can just define their own URL in the module. --- modules/nixos/services/ente-auth/default.nix | 10 +++++++++- packages/ente-web-auth/default.nix | 1 - 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/nixos/services/ente-auth/default.nix b/modules/nixos/services/ente-auth/default.nix index 10dc6ec..a1b49bf 100644 --- a/modules/nixos/services/ente-auth/default.nix +++ b/modules/nixos/services/ente-auth/default.nix @@ -9,6 +9,14 @@ with lib; with lib.${namespace}; let cfg = config.${namespace}.services.ente-auth; + + enteApp = + cfg.package.override { + extraBuildEnv = { + NEXT_PUBLIC_ENTE_ENDPOINT = "https://ente-api.monapona.dev"; + NEXT_TELEMETRY_DISABLED = "1"; + }; + }; in { options.${namespace}.services.ente-auth = { @@ -49,7 +57,7 @@ in forceSSL = true; useACMEHost = "stahl.sh"; locations."/" = { - root = "${cfg.package}"; + root = enteApp; }; }; }; diff --git a/packages/ente-web-auth/default.nix b/packages/ente-web-auth/default.nix index cd3451d..6108b43 100644 --- a/packages/ente-web-auth/default.nix +++ b/packages/ente-web-auth/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation (finalAttrs: { env = extraBuildEnv; buildPhase = '' - export NEXT_PUBLIC_ENTE_ENDPOINT=https://ente-api.monapona.dev yarn build:auth '';