From 635a24559240d351799e60e90ac0d088c67f908e Mon Sep 17 00:00:00 2001 From: teutat3s Date: Thu, 8 Feb 2024 20:03:04 +0100 Subject: [PATCH] keycloak: use base theme again https://github.com/p2-inc/keycloak-account-v1 --- account/theme.properties | 2 +- overlay.nix | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/account/theme.properties b/account/theme.properties index 2f88f77..5052c5f 100644 --- a/account/theme.properties +++ b/account/theme.properties @@ -1,4 +1,4 @@ -parent=keycloak.v2 +parent=keycloak-v1 import=common/pub.solar styles= diff --git a/overlay.nix b/overlay.nix index 1fca06a..0e88377 100644 --- a/overlay.nix +++ b/overlay.nix @@ -1,10 +1,22 @@ final: prev: let pkgs = final; + version = "0.1"; + keycloak-account-v1 = prev.fetchMavenArtifact { + artifactId = "keycloak-account-v1"; + groupId = "io.phasetwo.keycloak"; + inherit version; + hash = "sha256-t4kuc5ZieqsC06/alFN0W1ktORuk36TIgKXfrmBtesA="; + }; in { # this key should be the same as the simpleFlake name attribute. keycloak-theme-pub-solar = { keycloak-theme-pub-solar = import ./pkgs/keycloak-theme-pub-solar.nix { inherit pkgs; }; + keycloak = prev.keycloak.overrideAttrs (finalAttrs: previousAttrs: { + installPhase = previousAttrs.installPhase + '' + ln -s ${keycloak-account-v1}/share/java/keycloak-account-v1-${version}.jar $out/providers/keycloak-account-v1-${version}.jar + ''; + }); }; }