diff options
| author | TheSandwichMakr <TheSandwichMakr@users.noreply.github.com> | 2019-07-27 22:17:02 +0000 |
|---|---|---|
| committer | TheSandwichMakr <TheSandwichMakr@users.noreply.github.com> | 2019-07-27 22:17:02 +0000 |
| commit | f3b16937590c10e4f932e8d779368219e5c0c26d (patch) | |
| tree | 046853a085e8007789d67afabace4422a1992d74 /pkgs/games/multimc | |
| parent | b515a14c8fc07c86808a523e8edf80fc6d091fdd (diff) | |
| download | nixpkgs-f3b16937590c10e4f932e8d779368219e5c0c26d.tar nixpkgs-f3b16937590c10e4f932e8d779368219e5c0c26d.tar.gz nixpkgs-f3b16937590c10e4f932e8d779368219e5c0c26d.tar.bz2 nixpkgs-f3b16937590c10e4f932e8d779368219e5c0c26d.tar.lz nixpkgs-f3b16937590c10e4f932e8d779368219e5c0c26d.tar.xz nixpkgs-f3b16937590c10e4f932e8d779368219e5c0c26d.tar.zst nixpkgs-f3b16937590c10e4f932e8d779368219e5c0c26d.zip | |
multimc: wrapQtAppsHook, add xrandr for lwjgl 2.9.2
Diffstat (limited to 'pkgs/games/multimc')
| -rw-r--r-- | pkgs/games/multimc/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 7e6e034a2b5..d95532b438b 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -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 libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; -in stdenv.mkDerivation rec { +in mkDerivation rec { name = "multimc-${version}"; version = "0.6.4"; src = fetchFromGitHub { @@ -21,7 +21,11 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/{applications,pixmaps} cp ../application/resources/multimc/scalable/multimc.svg $out/share/pixmaps 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, # the desktop icon refers to `multimc`, but the executable actually gets |