Infinidoge/universe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(fabric-server): take lock as generate-loader input

Browse source
This commit is contained in:
Infinidoge 2022-03-03 17:10:14 -05:00
parent 6cafe81380
commit 3afa7f3e44
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkgs/fabric-server/default.nix
View file

@ -1,7 +1,7 @@
{ callPackage, writeTextFile, writeShellScriptBin, minecraft-server, jre_headless }: { callPackage, writeTextFile, writeShellScriptBin, minecraft-server, jre_headless }:
let let
loader = callPackage ./generate-loader.nix { }; loader = callPackage ./generate-loader.nix { lock = import ./lock.nix; };
log4j = writeTextFile { log4j = writeTextFile {
name = "log4j.xml"; name = "log4j.xml";
text = '' text = ''

5
pkgs/fabric-server/generate-loader.nix
View file

@ -1,7 +1,6 @@
{ lib, fetchurl, stdenv, unzip, zip, jre_headless }: { lib, fetchurl, stdenv, unzip, zip, jre_headless, lock }:
let let
lock = import ./lock.nix;
libraries = lib.forEach lock.libraries fetchurl; libraries = lib.forEach lock.libraries fetchurl;
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -23,7 +22,7 @@ stdenv.mkDerivation {
EOF EOF
cat > fabric-server-launch.properties << EOF cat > fabric-server-launch.properties << EOF
launch.mainClass=net.fabricmc.loader.impl.launch.knot.KnotServer launch.mainClass=${lock.mainClass}
EOF EOF
''; '';