From ae3c613f6cc2070fc4e191fd923fb7f9ed30c768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <muscaln@protonmail.com>
Date: Sun, 9 Jan 2022 01:23:53 +0300
Subject: [PATCH] nix: use user package set on overlay and switch to ninja

---
 flake.nix                       | 6 +++++-
 packages/nix/polymc/default.nix | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index b30008a46..d6885c3b7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,7 +27,11 @@
         };
 
         overlay = (final: prev: rec { 
-          polymc = packages.polymc;
+          polymc = prev.libsForQt5.callPackage ./packages/nix/polymc {
+            inherit self;
+            submoduleQuazip = quazip;
+            submoduleNbt = libnbtplusplus;
+          };
         });
 
         apps = {
diff --git a/packages/nix/polymc/default.nix b/packages/nix/polymc/default.nix
index 92097442f..4f80ff341 100644
--- a/packages/nix/polymc/default.nix
+++ b/packages/nix/polymc/default.nix
@@ -5,6 +5,7 @@
 , substituteAll
 , fetchpatch
 , cmake
+, ninja
 , jdk8
 , jdk
 , zlib
@@ -38,7 +39,7 @@ mkDerivation rec {
 
   src = lib.cleanSource self;
 
-  nativeBuildInputs = [ cmake file makeWrapper ];
+  nativeBuildInputs = [ cmake ninja file makeWrapper ];
   buildInputs = [ qtbase jdk8 zlib ];
 
   postUnpack = ''
@@ -50,6 +51,7 @@ mkDerivation rec {
   '';
 
   cmakeFlags = [
+    "-GNinja"
     "-DLauncher_LAYOUT=lin-system"
   ];