From 191ec6d0e0d4dbe407051c95d7afbbe77ef2fe48 Mon Sep 17 00:00:00 2001 From: Gregor Lohaus Date: Thu, 28 May 2026 21:57:10 +0200 Subject: [PATCH] add gluon substrate as flake input --- flake.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 43c9eab..dd61bdf 100644 --- a/flake.nix +++ b/flake.nix @@ -129,16 +129,22 @@ preConfigure = '' export HOME="$TMPDIR/home" - mkdir -p "$HOME/.gluon/substrate" - cp -f ${javafxStaticSdkZip} "$HOME/.gluon/substrate/openjfx-21-ea+11.3-linux-x86_64-static.zip" - chmod u+w "$HOME/.gluon/substrate/openjfx-21-ea+11.3-linux-x86_64-static.zip" + export GRADLE_OPTS="-Duser.home=$HOME ''${GRADLE_OPTS:-}" + for gluonHome in "$HOME/.gluon" /build/.gluon; do + mkdir -p "$gluonHome/substrate" + cp -f ${javafxStaticSdkZip} "$gluonHome/substrate/openjfx-21-ea+11.3-linux-x86_64-static.zip" + chmod u+w "$gluonHome/substrate/openjfx-21-ea+11.3-linux-x86_64-static.zip" + done ''; preBuild = '' export HOME="$TMPDIR/home" - mkdir -p "$HOME/.gluon/substrate" - cp -f ${javafxStaticSdkZip} "$HOME/.gluon/substrate/openjfx-21-ea+11.3-linux-x86_64-static.zip" - chmod u+w "$HOME/.gluon/substrate/openjfx-21-ea+11.3-linux-x86_64-static.zip" + export GRADLE_OPTS="-Duser.home=$HOME ''${GRADLE_OPTS:-}" + for gluonHome in "$HOME/.gluon" /build/.gluon; do + mkdir -p "$gluonHome/substrate" + cp -f ${javafxStaticSdkZip} "$gluonHome/substrate/openjfx-21-ea+11.3-linux-x86_64-static.zip" + chmod u+w "$gluonHome/substrate/openjfx-21-ea+11.3-linux-x86_64-static.zip" + done export LD_LIBRARY_PATH="${pkgs.lib.makeLibraryPath runtimeLibs}:$LD_LIBRARY_PATH" '';