From 2778fe760bfb1042511cffb481d90cc1ad06910f Mon Sep 17 00:00:00 2001 From: Evan Goode Date: Thu, 16 May 2024 21:55:48 -0400 Subject: [PATCH] Use $FJORDLAUNCHER_JAVA_PATHS --- launcher/java/JavaUtils.cpp | 2 +- nix/pkg/wrapper.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp index da784c491..3c39120c1 100644 --- a/launcher/java/JavaUtils.cpp +++ b/launcher/java/JavaUtils.cpp @@ -155,7 +155,7 @@ JavaInstallPtr JavaUtils::GetDefaultJava() QStringList addJavasFromEnv(QList 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 javaPaths = env.replace("\\", "/").split(QLatin1String(";")); diff --git a/nix/pkg/wrapper.nix b/nix/pkg/wrapper.nix index ac2ae7a2a..5ff7901c2 100644 --- a/nix/pkg/wrapper.nix +++ b/nix/pkg/wrapper.nix @@ -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