public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #65486 from TheSandwichMakr/master 

multimc: wrapQtAppsHook, add xrandr for lwjgl 2.9.2
This commit is contained in:
Samuel Dionne-Riel 2019-07-28 17:09:47 -04:00 committed by GitHub
parent c6e7bc2977 f3b1693759
commit ed51432500
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/games/multimc/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }: { stdenv, mkDerivation, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }:
let let
libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ];
in stdenv.mkDerivation rec { in mkDerivation rec {
name = "multimc-${version}"; name = "multimc-${version}";
version = "0.6.4"; version = "0.6.4";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -21,7 +21,11 @@ in stdenv.mkDerivation rec {
mkdir -p $out/share/{applications,pixmaps} mkdir -p $out/share/{applications,pixmaps}
cp ../application/resources/multimc/scalable/multimc.svg $out/share/pixmaps cp ../application/resources/multimc/scalable/multimc.svg $out/share/pixmaps
cp ../application/package/linux/multimc.desktop $out/share/applications cp ../application/package/linux/multimc.desktop $out/share/applications
wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/ # 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/
# MultiMC's CMakeLists.txt puts libraries in bin directory, causing them to be set executable, causing nixpkgs' wrapQtAppsHook to wrap them
chmod -x $out/bin/*.so
# As of https://github.com/MultiMC/MultiMC5/blob/7ea1d68244fdae1e7672fb84199ee71e168b31ca/application/package/linux/multimc.desktop, # As of https://github.com/MultiMC/MultiMC5/blob/7ea1d68244fdae1e7672fb84199ee71e168b31ca/application/package/linux/multimc.desktop,
# the desktop icon refers to `multimc`, but the executable actually gets # the desktop icon refers to `multimc`, but the executable actually gets