From 3afa7f3e44d86a8eae9562ae7a59bb609458f550 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Thu, 3 Mar 2022 17:10:14 -0500
Subject: [PATCH] refactor(fabric-server): take lock as generate-loader input

---
 pkgs/fabric-server/default.nix         | 2 +-
 pkgs/fabric-server/generate-loader.nix | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/fabric-server/default.nix b/pkgs/fabric-server/default.nix
index c2100ad..b4c81f0 100644
--- a/pkgs/fabric-server/default.nix
+++ b/pkgs/fabric-server/default.nix
@@ -1,7 +1,7 @@
 { callPackage, writeTextFile, writeShellScriptBin, minecraft-server, jre_headless }:
 
 let
-  loader = callPackage ./generate-loader.nix { };
+  loader = callPackage ./generate-loader.nix { lock = import ./lock.nix; };
   log4j = writeTextFile {
     name = "log4j.xml";
     text = ''
diff --git a/pkgs/fabric-server/generate-loader.nix b/pkgs/fabric-server/generate-loader.nix
index 252f9f7..e1daeab 100644
--- a/pkgs/fabric-server/generate-loader.nix
+++ b/pkgs/fabric-server/generate-loader.nix
@@ -1,7 +1,6 @@
-{ lib, fetchurl, stdenv, unzip, zip, jre_headless }:
+{ lib, fetchurl, stdenv, unzip, zip, jre_headless, lock }:
 
 let
-  lock = import ./lock.nix;
   libraries = lib.forEach lock.libraries fetchurl;
 in
 stdenv.mkDerivation {
@@ -23,7 +22,7 @@ stdenv.mkDerivation {
     EOF
 
     cat > fabric-server-launch.properties << EOF
-    launch.mainClass=net.fabricmc.loader.impl.launch.knot.KnotServer
+    launch.mainClass=${lock.mainClass}
     EOF
   '';