diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/games/multimc/default.nix | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/games/multimc/default.nix')
-rw-r--r-- | pkgs/games/multimc/default.nix | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index bcdd950de4a..aa32efaa940 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -1,21 +1,28 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }: +{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL }: let - libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; + libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ]; in mkDerivation rec { pname = "multimc"; - version = "0.6.11"; + version = "unstable-2021-06-21"; src = fetchFromGitHub { owner = "MultiMC"; repo = "MultiMC5"; - rev = version; - sha256 = "1jkbmb4sgfk8d93f5l1vd9pkpvhq9sxacc61w0rvf5xmz0wnszmz"; + rev = "8179a89103833805d5374399d80a4305be1b8355"; + sha256 = "lPz6ZM7TjaixfwWMPaXijKZJQKFPrCegBhvbJ8Xg4P8="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake file makeWrapper ]; - buildInputs = [ qtbase jdk zlib ]; + buildInputs = [ qtbase jdk8 zlib ]; - enableParallelBuilding = true; + patches = [ ./0001-pick-latest-java-first.patch ]; + + postPatch = '' + # hardcode jdk paths + substituteInPlace api/logic/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 = [ "-DMultiMC_LAYOUT=lin-system" ]; @@ -24,10 +31,12 @@ in mkDerivation rec { install -Dm755 ../application/package/linux/multimc.desktop $out/share/applications/multimc.desktop # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 - wrapProgram $out/bin/multimc --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/:${xorg.xrandr}/bin/ + wrapProgram $out/bin/multimc \ + --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \ + --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://multimc.org/"; description = "A free, open source launcher for Minecraft"; longDescription = '' @@ -35,6 +44,6 @@ in mkDerivation rec { ''; platforms = platforms.linux; license = licenses.lgpl21Plus; - maintainers = [ maintainers.cleverca22 ]; + maintainers = with maintainers; [ cleverca22 starcraft66 ]; }; } |