Skip to content

multimc: fix build with Qt 5.11, fix desktop icon #42432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xeji merged 2 commits into from
Jun 25, 2018
Merged

multimc: fix build with Qt 5.11, fix desktop icon #42432

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28ff1f7
multimc: 0.6.2 → unstable-2018-06-04
Jun 23, 2018
be47f95
multimc: create compatibility symlink to fix desktop icon
Jun 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions pkgs/games/multimc/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand All @@ -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; {
Expand Down