diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 71c7e300a63..67f0a87df65 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, qt5Full, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qt5 }: +{ stdenv, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, quazip }: let libnbt = fetchFromGitHub { @@ -16,7 +16,7 @@ stdenv.mkDerivation { rev = "895d8ab4699f1b50bf03532c967a91f5ecb62a50"; sha256 = "179vc1iv57fx4g4h1wy8yvyvdm671jnvp6zi8pcr1n6azqhwklds"; }; - buildInputs = [ cmake qt5Full jdk zlib file makeWrapper ]; + buildInputs = [ cmake qtbase jdk zlib file makeWrapper ]; libpath = with xorg; [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; postUnpack = '' @@ -24,7 +24,7 @@ stdenv.mkDerivation { cp -r ${libnbt} $sourceRoot/depends/libnbtplusplus chmod 755 -R $sourceRoot/depends/libnbtplusplus mkdir -pv $sourceRoot/build/ - cp -v ${qt5.quazip.src} $sourceRoot/build/quazip-0.7.1.tar.gz + cp -v ${quazip.src} $sourceRoot/build/quazip-0.7.1.tar.gz ''; patches = [ ./multimc.patch ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e657e9686eb..2fd58ceeaca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16133,7 +16133,7 @@ with pkgs; minecraft-server = callPackage ../games/minecraft-server { }; - multimc = callPackage ../games/multimc { }; + multimc = qt5.callPackage ../games/multimc { }; minetest = callPackage ../games/minetest { libpng = libpng12;