Skip to content

Commit

Permalink
Use $FJORDLAUNCHER_JAVA_PATHS
Browse files Browse the repository at this point in the history
  • Loading branch information
evan-goode committed May 17, 2024
1 parent 59c0625 commit 2778fe7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion launcher/java/JavaUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ JavaInstallPtr JavaUtils::GetDefaultJava()

QStringList addJavasFromEnv(QList<QString> javas)
{
auto env = qEnvironmentVariable("POLLYMC_JAVA_PATHS"); // FIXME: use launcher name from buildconfig
auto env = qEnvironmentVariable("FJORDLAUNCHER_JAVA_PATHS"); // FIXME: use launcher name from buildconfig
#if defined(Q_OS_WIN32)
QList<QString> javaPaths = env.replace("\\", "/").split(QLatin1String(";"));

Expand Down
2 changes: 1 addition & 1 deletion nix/pkg/wrapper.nix
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ in
]
++ additionalPrograms;
in
["--prefix POLLYMC_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}"]
["--prefix FJORDLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}"]
++ lib.optionals stdenv.isLinux [
"--set LD_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}"
# xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
Expand Down

0 comments on commit 2778fe7

Please sign in to comment.