backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #323 from milomc123/nix-build-fix
Some checks are pending
Publish Documentation / build (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux (push) Waiting to run
Details
Build (Linux, x86_64) / build-linux-debug (push) Waiting to run
Details
Clang Format / clang-format (push) Waiting to run
Details

Browse source 
Fix nix flake build phase errors
This commit is contained in:
Tropical 2026-03-28 05:04:14 -05:00 committed by GitHub
parent 38ba5e144d f195fc555f
commit caa512fcdb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
flake.nix
View file

@ -58,15 +58,15 @@
# 4jcraft - Meson expects this subprojects structure # 4jcraft - Meson expects this subprojects structure
postUnpack = '' postUnpack = ''
mkdir -p source/subprojects mkdir -p $sourceRoot/subprojects
cp -r ${inputs.shiggy} source/subprojects/shiggy cp -r ${inputs.shiggy} $sourceRoot/subprojects/shiggy
cp -r ${inputs."4jlibs"} source/subprojects/4jlibs cp -r ${inputs."4jlibs"} $sourceRoot/subprojects/4jlibs
cp -r ${inputs.stb} source/subprojects/stb cp -r ${inputs.stb} $sourceRoot/subprojects/stb
cp -r ${inputs.simdutf} source/subprojects/simdutf cp -r ${inputs.simdutf} $sourceRoot/subprojects/simdutf
cp -r ${inputs.miniaudio} source/subprojects/miniaudio cp -r ${inputs.miniaudio} $sourceRoot/subprojects/miniaudio
chmod -R u+w source/subprojects chmod -R u+w $sourceRoot/subprojects
''; '';
# 4jcraft - `stb` and `simdutf` patches # 4jcraft - `stb` and `simdutf` patches
@ -75,7 +75,7 @@
cp subprojects/packagefiles/simdutf/meson.build subprojects/simdutf/meson.build cp subprojects/packagefiles/simdutf/meson.build subprojects/simdutf/meson.build
cp subprojects/packagefiles/simdutf/meson.options subprojects/simdutf/meson.options cp subprojects/packagefiles/simdutf/meson.options subprojects/simdutf/meson.options
${pkgs.unzip} ${inputs.miniaudio-patch} -d miniaudio-patch-tmp unzip ${inputs.miniaudio-patch} -d miniaudio-patch-tmp
cp -r miniaudio-patch-tmp/*/. subprojects/miniaudio/ cp -r miniaudio-patch-tmp/*/. subprojects/miniaudio/
cat > subprojects/miniaudio.wrap <<EOF cat > subprojects/miniaudio.wrap <<EOF
@ -88,10 +88,12 @@
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
lld lld
makeWrapper
meson meson
ninja ninja
pkg-config pkg-config
python3 python3
unzip
]; ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [
@ -107,7 +109,7 @@
cp -r Minecraft.Client/. $out/share/4jcraft/ cp -r Minecraft.Client/. $out/share/4jcraft/
mkdir -p $out/bin mkdir -p $out/bin
${pkgs.makeWrapper} $out/share/4jcraft/Minecraft.Client $out/bin/4jcraft \ makeWrapper $out/share/4jcraft/Minecraft.Client $out/bin/4jcraft \
--run "cd $out/share/4jcraft" --run "cd $out/share/4jcraft"
''; '';