diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2018-12-02 07:55:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-02 07:55:06 +0100 |
| commit | d6cb669a443701db36f96b26bfe66b1350319fa3 (patch) | |
| tree | 566bc0f7f118a2a1cebd83dc8ca67e0610a94ec2 /pkgs | |
| parent | d23acab3a365eb0f620c0849a3ffb8b6c72f8a4d (diff) | |
| parent | 0d2355d7e37ec5ea87cad880d27626b89fafe36d (diff) | |
| download | nixpkgs-d6cb669a443701db36f96b26bfe66b1350319fa3.tar nixpkgs-d6cb669a443701db36f96b26bfe66b1350319fa3.tar.gz nixpkgs-d6cb669a443701db36f96b26bfe66b1350319fa3.tar.bz2 nixpkgs-d6cb669a443701db36f96b26bfe66b1350319fa3.tar.lz nixpkgs-d6cb669a443701db36f96b26bfe66b1350319fa3.tar.xz nixpkgs-d6cb669a443701db36f96b26bfe66b1350319fa3.tar.zst nixpkgs-d6cb669a443701db36f96b26bfe66b1350319fa3.zip | |
Merge pull request #51350 from Infinisil/fix/minecraft
minecraft: Fix versions <1.13
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/games/minecraft/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 76edc512b0e..32830d6f3d0 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper -, jdk, jre, libpulseaudio +, jdk, jre, libpulseaudio, libXxf86vm }: let @@ -13,6 +13,11 @@ let categories = "Game;"; }; + libPath = stdenv.lib.makeLibraryPath [ + libpulseaudio + libXxf86vm # Needed only for versions <1.13 + ]; + in stdenv.mkDerivation { name = "minecraft-2015-07-24"; @@ -30,7 +35,7 @@ in stdenv.mkDerivation { makeWrapper ${jre}/bin/java $out/bin/minecraft \ --add-flags "-jar $out/share/minecraft/minecraft.jar" \ - --suffix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libpulseaudio ]} + --suffix LD_LIBRARY_PATH : ${libPath} cp $src $out/share/minecraft/minecraft.jar cp -r ${desktopItem}/share/applications $out/share |