ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-16 18:37:04 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13617 from cleverca22/multimc-master

Browse Source 
multimc: fix building under chroot
This commit is contained in:
Domen Kožar 2016-03-02 17:50:45 +00:00
commit 30ca5aa4e2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -68,6 +68,7 @@
chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
chattered = "Phil Scott <me@philscotted.com>";
christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>";
cleverca22 = "Michael Bishop <cleverca22@gmail.com>";
coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
codsl = "codsl <codsl@riseup.net>";
codyopel = "Cody Opel <codyopel@gmail.com>";

5
pkgs/games/multimc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, qt5Full, jdk7, zlib, file, makeWrapper, xorg, libpulseaudio }:
{ stdenv, fetchFromGitHub, cmake, qt5Full, jdk7, zlib, file, makeWrapper, xorg, libpulseaudio, qt5 }:
let
libnbt = fetchFromGitHub {
@ -23,6 +23,8 @@ stdenv.mkDerivation {
rmdir $sourceRoot/depends/libnbtplusplus
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
'';
patches = [ ./multimc.patch ];
@ -51,5 +53,6 @@ stdenv.mkDerivation {
'';
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.lgpl21Plus;
maintainers = stdenv.lib.maintainers.cleverca22;
};
}