swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

multimc: don't use qt.full

Browse source
This commit is contained in:
Nikolay Amiantov 2017-02-03 18:20:25 +03:00
parent de9017ee68
commit 8a67af13f4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/games/multimc/default.nix
View file

@ -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 let
libnbt = fetchFromGitHub { libnbt = fetchFromGitHub {
@ -16,7 +16,7 @@ stdenv.mkDerivation {
rev = "895d8ab4699f1b50bf03532c967a91f5ecb62a50"; rev = "895d8ab4699f1b50bf03532c967a91f5ecb62a50";
sha256 = "179vc1iv57fx4g4h1wy8yvyvdm671jnvp6zi8pcr1n6azqhwklds"; 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 ]; libpath = with xorg; [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ];
postUnpack = '' postUnpack = ''
@ -24,7 +24,7 @@ stdenv.mkDerivation {
cp -r ${libnbt} $sourceRoot/depends/libnbtplusplus cp -r ${libnbt} $sourceRoot/depends/libnbtplusplus
chmod 755 -R $sourceRoot/depends/libnbtplusplus chmod 755 -R $sourceRoot/depends/libnbtplusplus
mkdir -pv $sourceRoot/build/ 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 ]; patches = [ ./multimc.patch ];

2
pkgs/top-level/all-packages.nix
View file

@ -16133,7 +16133,7 @@ with pkgs;
minecraft-server = callPackage ../games/minecraft-server { }; minecraft-server = callPackage ../games/minecraft-server { };
multimc = callPackage ../games/multimc { }; multimc = qt5.callPackage ../games/multimc { };
minetest = callPackage ../games/minetest { minetest = callPackage ../games/minetest {
libpng = libpng12; libpng = libpng12;