24.05 + polymc

This commit is contained in:
2024-06-01 11:51:06 -06:00
parent 320f140f52
commit 84f2ea8d53
8 changed files with 39 additions and 40 deletions

View File

@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, cmake, ninja, jdk21, ghc_filesystem, zlib, file
{ stdenv, lib, fetchFromGitHub, cmake, ninja, jdk17, ghc_filesystem, zlib, file
, xorg, libpulseaudio, openal, qt6, glfw, pciutils, udev, glxinfo, qt6Packages
, libGL, flite, addOpenGLRunpath, vulkan-loader, msaClientID ? null
, extra-cmake-modules, makeWrapper, gamemode, mangohud, glfw-wayland-minecraft
@@ -45,7 +45,7 @@ let
cmake
extra-cmake-modules
ninja
jdk21
jdk17
qt6.wrapQtAppsHook
file
ghc_filesystem
@@ -68,7 +68,7 @@ let
postPatch = ''
# hardcode jdk paths
substituteInPlace launcher/java/JavaUtils.cpp \
--replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk21}/lib/openjdk/bin/java")'
--replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk17}/lib/openjdk/bin/java")'
'';
postFixup = ''