Merge pull request #94 from emanueljg/develop

fix Nix wrapper using wrong JAVA_PATHS env var
fn2006 · Sep 9, 2023 · a339ab6 · a339ab6
2 parents 230a961 + a9e02ff
commit a339ab6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp
@@ -154,7 +154,7 @@ JavaInstallPtr JavaUtils::GetDefaultJava()
 
 QStringList addJavasFromEnv(QList<QString> javas)
 {
-    auto env = qEnvironmentVariable("PRISMLAUNCHER_JAVA_PATHS");  // FIXME: use launcher name from buildconfig
+    auto env = qEnvironmentVariable("POLLYMC_JAVA_PATHS");  // FIXME: use launcher name from buildconfig
 #if defined(Q_OS_WIN32)
     QList<QString> javaPaths = env.replace("\\", "/").split(QLatin1String(";"));
 

diff --git a/nix/pkg/wrapper.nix b/nix/pkg/wrapper.nix
@@ -80,7 +80,7 @@ in
         ]
         ++ additionalPrograms;
     in
-      ["--prefix pollymc_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}"]
+      ["--prefix POLLYMC_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}"]
       ++ lib.optionals stdenv.isLinux [
         "--set LD_LIBRARY_PATH /run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs}"
         # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128