git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #51350 from Infinisil/fix/minecraft

minecraft: Fix versions <1.13

commitd6cb669a443701db36f96b26bfe66b1350319fa3 authorSilvan Mosberger <infinisil@icloud.com> dateSun 2 Dec 2018, 07:55 (8 years ago) parentd23acab0d2355d
1 file changed+7−2
pkgs/games/minecraft/default.nix+7−2
pkgs/games/minecraft/default.nix+7−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, makeDesktopItem, makeWrapper
2−, jdk, jre, libpulseaudio
2+, jdk, jre, libpulseaudio, libXxf86vm
33}:
44
55let
@@ -13,6 +13,11 @@ let
1313 categories = "Game;";
1414 };
1515
16+ libPath = stdenv.lib.makeLibraryPath [
17+ libpulseaudio
18+ libXxf86vm # Needed only for versions <1.13
19+ ];
20+
1621in stdenv.mkDerivation {
1722 name = "minecraft-2015-07-24";
1823
@@ -30,7 +35,7 @@ in stdenv.mkDerivation {
3035
3136 makeWrapper ${jre}/bin/java $out/bin/minecraft \
3237 --add-flags "-jar $out/share/minecraft/minecraft.jar" \
33− --suffix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libpulseaudio ]}
38+ --suffix LD_LIBRARY_PATH : ${libPath}
3439
3540 cp $src $out/share/minecraft/minecraft.jar
3641 cp -r ${desktopItem}/share/applications $out/share