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

Merge pull request #42432 from Pneumaticat/multimc

Browse Source 
multimc: fix build with Qt 5.11, fix desktop icon
This commit is contained in:
xeji 2018-06-25 11:53:02 +02:00 committed by GitHub
commit e0918b2550
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,12 +4,14 @@ let
libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ];
in stdenv.mkDerivation rec {
name = "multimc-${version}";
version = "0.6.2";
# Current release as of 2018-06-23 (v0.6.2) breaks under Qt 5.11—see
# https://github.com/NixOS/nixpkgs/issues/42387
version = "unstable-2018-06-04";
src = fetchFromGitHub {
owner = "MultiMC";
repo = "MultiMC5";
rev = version;
sha256 = "07jrr6si8nzfqwf073zhgw47y6snib23ad3imh1ik1nn5r7wqy3c";
rev = "19bb50b872da2702b8e0b65f3f7b6b54c1c5b071";
sha256 = "01frkk2klm1axr7ywnj23ikxn5pkgj8q6w8vqbslsvmh8bni8rk0";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake file makeWrapper ];
@ -22,6 +24,12 @@ in stdenv.mkDerivation rec {
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/
# 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
# installed as `MultiMC`. Create compatibility symlink to fix the desktop
# icon.
ln -sf $out/bin/MultiMC $out/bin/multimc
'';
meta = with stdenv.lib; {