diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2022-06-14 00:05:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-14 00:05:49 -0500 |
| commit | 54c558e455030017e73b72fb7b3f591f5b4c6829 (patch) | |
| tree | 892506096e8a18278640299564fe36477279fc1e /pkgs/games | |
| parent | 996fb9668303cde6d15bf38d3794fb095a0d02a8 (diff) | |
| parent | 68c360c518091f0e2d355dd3aa7186f4e8da0935 (diff) | |
Merge pull request #177433 from muscaln/polymc-1.3.2
polymc: 1.3.1 -> 1.3.2
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/polymc/default.nix | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/pkgs/games/polymc/default.nix b/pkgs/games/polymc/default.nix index a0f4abc1e7ce1..2fa5ce7cf06fe 100644 --- a/pkgs/games/polymc/default.nix +++ b/pkgs/games/polymc/default.nix @@ -1,12 +1,12 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , cmake , jdk8 , jdk , zlib , file -, makeWrapper +, wrapQtAppsHook , xorg , libpulseaudio , qtbase @@ -15,32 +15,25 @@ , glfw , openal , msaClientID ? "" +, jdks ? [ jdk jdk8 ] }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "polymc"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "PolyMC"; repo = "PolyMC"; rev = version; - sha256 = "sha256-oTzhKGDi1Kr3JXY9dYQf1rVDPFr52tJ7L+rb5LCbtBE="; + sha256 = "sha256-hqsyS82UzgCUZ9HjoPKjOLE49fwLntRAh3mVrTsmi3o="; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake file jdk makeWrapper ]; + nativeBuildInputs = [ cmake file jdk wrapQtAppsHook ]; buildInputs = [ qtbase zlib quazip ]; - postPatch = '' - # hardcode jdk paths - substituteInPlace launcher/java/JavaUtils.cpp \ - --replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk}/lib/openjdk/bin/java")' \ - --replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")' - ''; - - cmakeFlags = [ "-DLauncher_PORTABLE=0" ] ++ - lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]; + cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]; dontWrapQtApps = true; @@ -58,9 +51,9 @@ mkDerivation rec { ]; in '' # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 - wrapProgram $out/bin/polymc \ - "''${qtWrapperArgs[@]}" \ + wrapQtApp $out/bin/polymc \ --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \ + --prefix POLYMC_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks} \ --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} ''; |