mirror of
https://github.com/gensokyo-zone/infrastructure.git
synced 2026-02-09 04:19:19 -08:00
refactor(minecraft): split up overlay
This commit is contained in:
arcnmx
parent
d957df7c8b
commit
6df95aa9ce
8 changed files with 171 additions and 165 deletions
|
|
@ -1,169 +1,12 @@
|
|||
final: prev: let
|
||||
inherit (final) lib;
|
||||
inherit (final) callPackage callPackages;
|
||||
in {
|
||||
minecraft-bedrock-server-libCrypto = let
|
||||
inherit (final) minecraft-bedrock-server;
|
||||
in minecraft-bedrock-server.stdenv.mkDerivation {
|
||||
pname = "${minecraft-bedrock-server.pname}-libcrypto";
|
||||
inherit (minecraft-bedrock-server) version src sourceRoot;
|
||||
nativeBuildInputs = with final; [
|
||||
autoPatchelfHook
|
||||
curl
|
||||
gcc-unwrapped
|
||||
openssl
|
||||
unzip
|
||||
];
|
||||
installPhase = ''
|
||||
install -m755 -D libCrypto.so $out/lib/libCrypto.so
|
||||
'';
|
||||
fixupPhase = ''
|
||||
autoPatchelf $out/lib/libCrypto.so
|
||||
'';
|
||||
meta.broken = true;
|
||||
};
|
||||
minecraft-bedrock-server = callPackage ../packages/minecraft-bedrock/server.nix { };
|
||||
minecraft-bedrock-server-libCrypto = callPackage ../packages/minecraft-bedrock/libcrypto.nix { };
|
||||
minecraft-bedrock-server-patchdebug = callPackage ../packages/minecraft-bedrock/patchdebug.nix { };
|
||||
minecraft-bedrock-server-patchelf = callPackage ../packages/minecraft-bedrock/patchelf.nix { };
|
||||
|
||||
minecraft-bedrock-server-patchdebug = let
|
||||
# https://github.com/minecraft-linux/server-modloader/tree/master?tab=readme-ov-file#getting-mods-to-work-on-newer-versions-116
|
||||
python = final.python3.withPackages (p: [ p.lief ]);
|
||||
script = ''
|
||||
import lief
|
||||
import sys
|
||||
|
||||
lib_symbols = lief.parse(sys.argv[1])
|
||||
for s in filter(lambda e: e.exported, lib_symbols.static_symbols):
|
||||
lib_symbols.add_dynamic_symbol(s)
|
||||
lib_symbols.write(sys.argv[2])
|
||||
'';
|
||||
name = "minecraft-bedrock-server-patchdebug";
|
||||
in final.writeTextFile {
|
||||
name = "${name}.py";
|
||||
destination = "/bin/${name}";
|
||||
executable = true;
|
||||
text = ''
|
||||
#!${lib.getExe python}
|
||||
${script}
|
||||
'';
|
||||
meta.mainProgram = name;
|
||||
};
|
||||
|
||||
minecraft-bedrock-server-patchelf = prev.patchelf.overrideDerivation (old: {
|
||||
postPatch = ''
|
||||
substituteInPlace src/patchelf.cc \
|
||||
--replace "32 * 1024 * 1024" "512 * 1024 * 1024"
|
||||
'';
|
||||
});
|
||||
|
||||
minecraft-bedrock-server = final.callPackage ../packages/minecraft-bedrock.nix { };
|
||||
|
||||
unzipMcpack = let
|
||||
f = { stdenvNoCC, unzip, writeText }: stdenvNoCC.mkDerivation {
|
||||
name = "unzip-mcpack";
|
||||
propagatedBuildInputs = [ unzip ];
|
||||
dontUnpack = true;
|
||||
setupHook = writeText "mcpack-setup-hook.sh" ''
|
||||
unpackCmdHooks+=(_tryUnzipMcpack)
|
||||
_tryUnzipMcpack() {
|
||||
if ! [[ "$curSrc" =~ \.mcpack$ ]]; then return 1; fi
|
||||
|
||||
LANG=en_US.UTF-8 unzip -qq "$curSrc"
|
||||
}
|
||||
'';
|
||||
};
|
||||
in final.callPackage f { };
|
||||
mkMinecraftBedrockServerAddon = let
|
||||
argNames = [ "mcpackModules" "mcpackVersion" "mcpackId" ];
|
||||
f = { stdenvNoCC, unzipMcpack, minecraft-bedrock-server, lib }: {
|
||||
src,
|
||||
pname,
|
||||
version,
|
||||
mcpackVersion ? version,
|
||||
mcVersion ? null,
|
||||
mcpackId,
|
||||
mcpackModules ? [ ],
|
||||
mcpackDir ? pname,
|
||||
mcpackType ? "behavior_packs",
|
||||
...
|
||||
}@args: let
|
||||
inherit (lib.strings) optionalString splitString;
|
||||
inherit (minecraft-bedrock-server) dataDir;
|
||||
in stdenvNoCC.mkDerivation (removeAttrs args argNames // {
|
||||
inherit dataDir mcpackType mcpackDir;
|
||||
version = version + optionalString (mcVersion != null) "-${mcVersion}";
|
||||
nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
|
||||
unzipMcpack
|
||||
];
|
||||
installPhase = args.installPhase or ''
|
||||
install -d "$out$dataDir/$mcpackType/$mcpackDir"
|
||||
cp -a ./* "$out$dataDir/$mcpackType/$mcpackDir/"
|
||||
|
||||
install ./manifest.json $manifest
|
||||
'';
|
||||
outputs = [ "out" "manifest" ];
|
||||
passthru = args.passthru or { } // {
|
||||
minecraft-bedrock = args.passthru.minecraft-bedrock or { } // {
|
||||
pack = args.passthru.minecraft-bedrock.pack or { } // {
|
||||
pack_id = mcpackId;
|
||||
modules = mcpackModules;
|
||||
version = splitString "." mcpackVersion;
|
||||
type = mcpackType;
|
||||
dir = mcpackDir;
|
||||
subPath = "${dataDir}/${mcpackType}/${mcpackDir}";
|
||||
};
|
||||
};
|
||||
};
|
||||
});
|
||||
in final.callPackage f { };
|
||||
|
||||
minecraft-bedrock-addons = {
|
||||
definitive-tree-capitator-bh = final.mkMinecraftBedrockServerAddon {
|
||||
pname = "definitive-tree-capitator-bh";
|
||||
version = "1.0.0";
|
||||
mcpackId = "b3538a6c-3e42-400a-9ed0-5ec1670b796c";
|
||||
mcpackVersion = "1.0.0";
|
||||
mcVersion = "1.20.20";
|
||||
src = final.fetchurl {
|
||||
url = "https://mediafilez.forgecdn.net/files/5214/136/Definitive%20Tree%20Capitator%20BH.mcpack";
|
||||
sha256 = "941564d65386fd2701dfe017408d8c1d5b6d6a90a017e60b7ef9f6ff6de7b51a";
|
||||
};
|
||||
};
|
||||
definitive-tree-capitator-rs = final.mkMinecraftBedrockServerAddon {
|
||||
pname = "definitive-tree-capitator-rs";
|
||||
version = "1.0.0";
|
||||
mcpackId = "e01dd561-a1d9-45d0-b6ad-cd3858b93fe7";
|
||||
mcpackVersion = "1.0.0";
|
||||
mcVersion = "1.13.0";
|
||||
mcpackType = "resource_packs";
|
||||
src = final.fetchurl {
|
||||
url = "https://mediafilez.forgecdn.net/files/5214/134/Definitive%20Tree%20Capitator%20RS.mcpack";
|
||||
sha256 = "22c8ff1c85720052d9f2a0af1c205b5457a9bb806d65125cff3751fdbe22b864";
|
||||
};
|
||||
};
|
||||
true-tree-capitator-bp = final.mkMinecraftBedrockServerAddon {
|
||||
pname = "true-tree-capitator-bp";
|
||||
version = "1.2";
|
||||
mcpackVersion = "1.0.0";
|
||||
mcpackId = "4d0f6078-f2f9-415f-9848-b36b008127b4";
|
||||
mcVersion = "1.20.71";
|
||||
src = final.fetchurl {
|
||||
name = "Tree-capitator-BP-v1.2.mcpack";
|
||||
url = "https://mediafilez.forgecdn.net/files/5237/589/Tree%20capitator%20%5BBP%5D%20v1.2.mcpack";
|
||||
sha256 = "c4b702be4dd45707b66ef3cfda578695347caa6a43ead30c06dc17cd14a00040";
|
||||
};
|
||||
sourceRoot = ".";
|
||||
};
|
||||
true-tree-capitator-rp = final.mkMinecraftBedrockServerAddon {
|
||||
pname = "true-tree-capitator-rp";
|
||||
version = "1.2";
|
||||
mcpackVersion = "1.0.0";
|
||||
mcpackId = "811af5f4-929b-4d77-aed4-119486b6c0a0";
|
||||
mcVersion = "1.20.71";
|
||||
mcpackType = "resource_packs";
|
||||
src = final.fetchurl {
|
||||
name = "Tree-capitator-RP-v1.2.mcpack";
|
||||
url = "https://mediafilez.forgecdn.net/files/5237/590/Tree%20capitator%20%5BRP%5D%20v1.2.mcpack";
|
||||
sha256 = "66c850106c7fa1764b32f20c555c1bb5e7e6905f3cbea4b429ca076e7a4cc31f";
|
||||
};
|
||||
sourceRoot = ".";
|
||||
};
|
||||
};
|
||||
minecraft-bedrock-addons = callPackages ../packages/minecraft-bedrock/addons.nix { };
|
||||
mkMinecraftBedrockServerAddon = final.callPackage ../packages/minecraft-bedrock/mkaddon.nix { };
|
||||
unzipMcpack = final.callPackage ../packages/minecraft-bedrock/mcpack.nix { };
|
||||
}
|
||||
|
|
|
|||
58
packages/minecraft-bedrock/addons.nix
Normal file
58
packages/minecraft-bedrock/addons.nix
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
{ mkMinecraftBedrockServerAddon, fetchurl }: {
|
||||
definitive-tree-capitator-bh = mkMinecraftBedrockServerAddon {
|
||||
pname = "definitive-tree-capitator-bh";
|
||||
version = "1.0.0";
|
||||
mcpackId = "b3538a6c-3e42-400a-9ed0-5ec1670b796c";
|
||||
mcpackVersion = "1.0.0";
|
||||
mcpackType = "behavior_packs";
|
||||
mcVersion = "1.20.20";
|
||||
src = fetchurl {
|
||||
url = "https://mediafilez.forgecdn.net/files/5214/136/Definitive%20Tree%20Capitator%20BH.mcpack";
|
||||
sha256 = "941564d65386fd2701dfe017408d8c1d5b6d6a90a017e60b7ef9f6ff6de7b51a";
|
||||
};
|
||||
};
|
||||
definitive-tree-capitator-rs = mkMinecraftBedrockServerAddon {
|
||||
pname = "definitive-tree-capitator-rs";
|
||||
version = "1.0.0";
|
||||
mcpackId = "e01dd561-a1d9-45d0-b6ad-cd3858b93fe7";
|
||||
mcpackVersion = "1.0.0";
|
||||
mcpackType = "resource_packs";
|
||||
mcVersion = "1.13.0";
|
||||
src = fetchurl {
|
||||
url = "https://mediafilez.forgecdn.net/files/5214/134/Definitive%20Tree%20Capitator%20RS.mcpack";
|
||||
sha256 = "22c8ff1c85720052d9f2a0af1c205b5457a9bb806d65125cff3751fdbe22b864";
|
||||
};
|
||||
};
|
||||
true-tree-capitator-bp = mkMinecraftBedrockServerAddon {
|
||||
pname = "true-tree-capitator-bp";
|
||||
version = "1.2";
|
||||
mcpackVersion = "1.0.0";
|
||||
mcpackId = "4d0f6078-f2f9-415f-9848-b36b008127b4";
|
||||
mcpackType = "behavior_packs";
|
||||
mcVersion = "1.20.71";
|
||||
src = fetchurl {
|
||||
name = "Tree-capitator-BP-v1.2.mcpack";
|
||||
url = "https://mediafilez.forgecdn.net/files/5237/589/Tree%20capitator%20%5BBP%5D%20v1.2.mcpack";
|
||||
sha256 = "c4b702be4dd45707b66ef3cfda578695347caa6a43ead30c06dc17cd14a00040";
|
||||
};
|
||||
sourceRoot = ".";
|
||||
postPatch = ''
|
||||
substituteInPlace manifest.json \
|
||||
--replace "1.10.0-beta" "1.10.0"
|
||||
'';
|
||||
};
|
||||
true-tree-capitator-rp = mkMinecraftBedrockServerAddon {
|
||||
pname = "true-tree-capitator-rp";
|
||||
version = "1.2";
|
||||
mcpackVersion = "1.0.0";
|
||||
mcpackId = "811af5f4-929b-4d77-aed4-119486b6c0a0";
|
||||
mcpackType = "resource_packs";
|
||||
mcVersion = "1.20.71";
|
||||
src = fetchurl {
|
||||
name = "Tree-capitator-RP-v1.2.mcpack";
|
||||
url = "https://mediafilez.forgecdn.net/files/5237/590/Tree%20capitator%20%5BRP%5D%20v1.2.mcpack";
|
||||
sha256 = "66c850106c7fa1764b32f20c555c1bb5e7e6905f3cbea4b429ca076e7a4cc31f";
|
||||
};
|
||||
sourceRoot = ".";
|
||||
};
|
||||
}
|
||||
20
packages/minecraft-bedrock/libcrypto.nix
Normal file
20
packages/minecraft-bedrock/libcrypto.nix
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
{ lib, minecraft-bedrock-server, stdenv, autoPatchelfHook, curl, gcc-unwrapped, unzip, openssl }: let
|
||||
inherit (lib.strings) versionAtLeast;
|
||||
in stdenv.mkDerivation {
|
||||
pname = "${minecraft-bedrock-server.pname}-libcrypto";
|
||||
inherit (minecraft-bedrock-server) version src sourceRoot;
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
curl
|
||||
gcc-unwrapped
|
||||
openssl
|
||||
unzip
|
||||
];
|
||||
installPhase = ''
|
||||
install -m755 -D libCrypto.so $out/lib/libCrypto.so
|
||||
'';
|
||||
fixupPhase = ''
|
||||
autoPatchelf $out/lib/libCrypto.so
|
||||
'';
|
||||
meta.broken = versionAtLeast minecraft-bedrock-server.version "1.20";
|
||||
}
|
||||
13
packages/minecraft-bedrock/mcpack.nix
Normal file
13
packages/minecraft-bedrock/mcpack.nix
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
{ stdenvNoCC, unzip, writeText }: stdenvNoCC.mkDerivation {
|
||||
name = "unzip-mcpack";
|
||||
propagatedBuildInputs = [ unzip ];
|
||||
dontUnpack = true;
|
||||
setupHook = writeText "mcpack-setup-hook.sh" ''
|
||||
unpackCmdHooks+=(_tryUnzipMcpack)
|
||||
_tryUnzipMcpack() {
|
||||
if ! [[ "$curSrc" =~ \.mcpack$ ]]; then return 1; fi
|
||||
|
||||
LANG=en_US.UTF-8 unzip -qq "$curSrc"
|
||||
}
|
||||
'';
|
||||
}
|
||||
42
packages/minecraft-bedrock/mkaddon.nix
Normal file
42
packages/minecraft-bedrock/mkaddon.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ stdenvNoCC, unzipMcpack, minecraft-bedrock-server, lib }:
|
||||
{
|
||||
src,
|
||||
pname,
|
||||
version,
|
||||
mcpackVersion ? version,
|
||||
mcVersion ? null,
|
||||
mcpackId,
|
||||
mcpackModules ? [ ],
|
||||
mcpackDir ? pname,
|
||||
mcpackType, # "behavior_packs" or "resource_packs" etc
|
||||
...
|
||||
}@args: let
|
||||
inherit (lib.strings) optionalString splitString;
|
||||
inherit (minecraft-bedrock-server) dataDir;
|
||||
argNames = [ "mcpackModules" "mcpackVersion" "mcpackId" ];
|
||||
in stdenvNoCC.mkDerivation (removeAttrs args argNames // {
|
||||
inherit dataDir mcpackType mcpackDir;
|
||||
version = version + optionalString (mcVersion != null) "-${mcVersion}";
|
||||
nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
|
||||
unzipMcpack
|
||||
];
|
||||
installPhase = args.installPhase or ''
|
||||
install -d "$out$dataDir/$mcpackType/$mcpackDir"
|
||||
cp -a ./* "$out$dataDir/$mcpackType/$mcpackDir/"
|
||||
|
||||
install ./manifest.json $manifest
|
||||
'';
|
||||
outputs = [ "out" "manifest" ];
|
||||
passthru = args.passthru or { } // {
|
||||
minecraft-bedrock = args.passthru.minecraft-bedrock or { } // {
|
||||
pack = args.passthru.minecraft-bedrock.pack or { } // {
|
||||
pack_id = mcpackId;
|
||||
modules = mcpackModules;
|
||||
version = splitString "." mcpackVersion;
|
||||
type = mcpackType;
|
||||
dir = mcpackDir;
|
||||
subPath = "${dataDir}/${mcpackType}/${mcpackDir}";
|
||||
};
|
||||
};
|
||||
};
|
||||
})
|
||||
24
packages/minecraft-bedrock/patchdebug.nix
Normal file
24
packages/minecraft-bedrock/patchdebug.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ lib, python3, writeTextFile }: let
|
||||
# https://github.com/minecraft-linux/server-modloader/tree/master?tab=readme-ov-file#getting-mods-to-work-on-newer-versions-116
|
||||
inherit (lib.meta) getExe;
|
||||
python = python3.withPackages (p: [ p.lief ]);
|
||||
script = ''
|
||||
import lief
|
||||
import sys
|
||||
|
||||
lib_symbols = lief.parse(sys.argv[1])
|
||||
for s in filter(lambda e: e.exported, lib_symbols.static_symbols):
|
||||
lib_symbols.add_dynamic_symbol(s)
|
||||
lib_symbols.write(sys.argv[2])
|
||||
'';
|
||||
name = "minecraft-bedrock-server-patchdebug";
|
||||
in writeTextFile {
|
||||
name = "${name}.py";
|
||||
destination = "/bin/${name}";
|
||||
executable = true;
|
||||
text = ''
|
||||
#!${getExe python}
|
||||
${script}
|
||||
'';
|
||||
meta.mainProgram = name;
|
||||
}
|
||||
6
packages/minecraft-bedrock/patchelf.nix
Normal file
6
packages/minecraft-bedrock/patchelf.nix
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{ patchelf }: patchelf.overrideDerivation (old: {
|
||||
postPatch = ''
|
||||
substituteInPlace src/patchelf.cc \
|
||||
--replace "32 * 1024 * 1024" "512 * 1024 * 1024"
|
||||
'';
|
||||
})
|
||||
Loading…
Add table
Add a link
Reference in a new issue