Merge pull request #13618 from cleverca22/multimc-release

multimc: fix building under chroot
NixOS · Mar 2, 2016 · 89d9159 · 89d9159
2 parents 31b5d57 + ff28655
commit 89d9159
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
@@ -67,6 +67,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>";

diff --git 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 }:
+{ 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;
   };
 }