diff options
author | Roman Naumann <namor@hemio.de> | 2016-12-29 14:02:52 +0100 |
---|---|---|
committer | Roman Naumann <namor@hemio.de> | 2016-12-29 14:02:52 +0100 |
commit | 87ef766f6b1718136ec851237856d6f9fc578ccf (patch) | |
tree | c1a2214867019e97f6b0623592c9d71995bd5be9 /pkgs/games/multimc | |
parent | 004eceb0f6c405515bc229c190d0da287fb51d94 (diff) | |
parent | 774435d0aa2c5e0cddb11a553ec1b1eaef748ed5 (diff) | |
download | nixlib-87ef766f6b1718136ec851237856d6f9fc578ccf.tar nixlib-87ef766f6b1718136ec851237856d6f9fc578ccf.tar.gz nixlib-87ef766f6b1718136ec851237856d6f9fc578ccf.tar.bz2 nixlib-87ef766f6b1718136ec851237856d6f9fc578ccf.tar.lz nixlib-87ef766f6b1718136ec851237856d6f9fc578ccf.tar.xz nixlib-87ef766f6b1718136ec851237856d6f9fc578ccf.tar.zst nixlib-87ef766f6b1718136ec851237856d6f9fc578ccf.zip |
Merge branch 'master' of github.com:nixos/nixpkgs into add_pkg_gorilla
Diffstat (limited to 'pkgs/games/multimc')
-rw-r--r-- | pkgs/games/multimc/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 00d4fbf84511..71c7e300a639 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, qt5Full, jdk7, zlib, file, makeWrapper, xorg, libpulseaudio, qt5 }: +{ stdenv, fetchFromGitHub, cmake, qt5Full, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qt5 }: let libnbt = fetchFromGitHub { @@ -16,7 +16,7 @@ stdenv.mkDerivation { rev = "895d8ab4699f1b50bf03532c967a91f5ecb62a50"; sha256 = "179vc1iv57fx4g4h1wy8yvyvdm671jnvp6zi8pcr1n6azqhwklds"; }; - buildInputs = [ cmake qt5Full jdk7 zlib file makeWrapper ]; + buildInputs = [ cmake qt5Full jdk zlib file makeWrapper ]; libpath = with xorg; [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; postUnpack = '' @@ -42,7 +42,7 @@ stdenv.mkDerivation { cp -v MultiMC $out/bin/ cp -v jars/*.jar $out/bin/jars/ #*/ cp -v librainbow.so libnbt++.so libMultiMC_logic.so $out/lib - wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH $RESULT --prefix PATH : ${jdk7}/bin/ + wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH $RESULT --prefix PATH : ${jdk}/bin/ ''; meta = with stdenv.lib; { |