From a12b2ce73c8cd2c2e1d7b469b205d5b93ec0949f Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Tue, 22 Mar 2022 15:03:47 -0400 Subject: [PATCH] keycloak: wrap all the shell scripts Most of these just need JAVA_HOME, but a few assume that java is in PATH --- pkgs/servers/keycloak/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 5913da777713..d9797de6d174 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -51,9 +51,11 @@ stdenv.mkDerivation rec { ln -s ${mkModuleXml "com.mysql" "mysql-connector-java.jar"} $module_path/com/mysql/main/module.xml ''} - wrapProgram $out/bin/standalone.sh --set JAVA_HOME ${jre} - wrapProgram $out/bin/add-user-keycloak.sh --set JAVA_HOME ${jre} - wrapProgram $out/bin/jboss-cli.sh --set JAVA_HOME ${jre} + for script in add-user-keycloak.sh add-user.sh domain.sh elytron-tool.sh jboss-cli.sh jconsole.sh jdr.sh standalone.sh wsconsume.sh wsprovide.sh; do + wrapProgram $out/bin/$script --set JAVA_HOME ${jre} + done + wrapProgram $out/bin/kcadm.sh --prefix PATH : ${jre}/bin + wrapProgram $out/bin/kcreg.sh --prefix PATH : ${jre}/bin ''; passthru = {