diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2017-02-03 09:57:58 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-03 09:57:58 -0600 |
| commit | 74f5672a1ced6b1fd4857ad27a488ca5561874e1 (patch) | |
| tree | 93d105998f309179b1309784a413251b5cd1d7bf /pkgs/games | |
| parent | 698f178d4ed1f04f58936fcfb1a0c0753ee69679 (diff) | |
| parent | 8a67af13f46a75427958320f2d354294be8a1e62 (diff) | |
Merge pull request #22406 from abbradar/qtenv
Qt 5: Use buildEnv for env, don't use it for packages
Diffstat (limited to 'pkgs/games')
| -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 71c7e300a639..67f0a87df659 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 ]; |