git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #65486 from TheSandwichMakr/master

multimc: wrapQtAppsHook, add xrandr for lwjgl 2.9.2

commited5143250008e58f03e25349234247ee15310ebb authorSamuel Dionne-Riel <samuel@dionne-riel.com> dateSun 28 Jul 2019, 17:09 (7 years ago) parentc6e7bc2f3b1693
1 file changed+7−3
pkgs/games/multimc/default.nix+7−3
pkgs/games/multimc/default.nix+7−3
@@ -1,8 +1,8 @@
1−{ stdenv, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }:
1+{ stdenv, mkDerivation, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }:
22
33let
44 libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ];
5−in stdenv.mkDerivation rec {
5+in mkDerivation rec {
66 name = "multimc-${version}";
77 version = "0.6.4";
88 src = fetchFromGitHub {
@@ -21,7 +21,11 @@ in stdenv.mkDerivation rec {
2121 mkdir -p $out/share/{applications,pixmaps}
2222 cp ../application/resources/multimc/scalable/multimc.svg $out/share/pixmaps
2323 cp ../application/package/linux/multimc.desktop $out/share/applications
24− wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/
24+ # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
25+ 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/
26+
27+ # MultiMC's CMakeLists.txt puts libraries in bin directory, causing them to be set executable, causing nixpkgs' wrapQtAppsHook to wrap them
28+ chmod -x $out/bin/*.so
2529
2630 # As of https://github.com/MultiMC/MultiMC5/blob/7ea1d68244fdae1e7672fb84199ee71e168b31ca/application/package/linux/multimc.desktop,
2731 # the desktop icon refers to `multimc`, but the executable actually gets