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 #307 from silverhadch/nix-fix

Browse source 
Fix Nix Package Part 12939.
This commit is contained in:
DecalOverdose 2026-03-25 12:46:16 +04:00 committed by GitHub
parent c90d9e11ef 6b08e0feb9
commit d6bfc20c5a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
flake.lock
View file

@ -65,6 +65,7 @@
"miniaudio-patch": "miniaudio-patch", "miniaudio-patch": "miniaudio-patch",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"shiggy": "shiggy", "shiggy": "shiggy",
"simdutf": "simdutf",
"stb": "stb" "stb": "stb"
} }
}, },
@ -85,6 +86,22 @@
"type": "github" "type": "github"
} }
}, },
"simdutf": {
"flake": false,
"locked": {
"lastModified": 1773677002,
"narHash": "sha256-kq53Jz9zm2bfs8x/74FQbzYrUc+VD7JlnBoYHnEHuSY=",
"owner": "simdutf",
"repo": "simdutf",
"rev": "04a9b596de943ea9e4d4c833e39740edf3c11e88",
"type": "github"
},
"original": {
"owner": "simdutf",
"repo": "simdutf",
"type": "github"
}
},
"stb": { "stb": {
"flake": false, "flake": false,
"locked": { "locked": {

19
flake.nix
View file

@ -24,6 +24,10 @@
url = "github:nothings/stb/master"; url = "github:nothings/stb/master";
flake = false; flake = false;
}; };
simdutf = {
url = "github:simdutf/simdutf";
flake = false;
};
}; };
outputs = { self, nixpkgs, ... } @ inputs: outputs = { self, nixpkgs, ... } @ inputs:
@ -48,7 +52,10 @@
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;
preConfigure = '' preConfigure = ''
# shiggy
cp -r ${inputs.shiggy} subprojects/shiggy cp -r ${inputs.shiggy} subprojects/shiggy
# miniaudio
cp -r ${inputs.miniaudio} subprojects/miniaudio cp -r ${inputs.miniaudio} subprojects/miniaudio
chmod -R u+w subprojects/miniaudio chmod -R u+w subprojects/miniaudio
unzip ${inputs."miniaudio-patch"} -d /tmp/miniaudio-patch/ unzip ${inputs."miniaudio-patch"} -d /tmp/miniaudio-patch/
@ -60,10 +67,20 @@
[provide] [provide]
dependency_names = miniaudio dependency_names = miniaudio
EOF EOF
# 4jlibs
cp -r ${inputs."4jlibs"} subprojects/4jlibs cp -r ${inputs."4jlibs"} subprojects/4jlibs
# stb
cp -r ${inputs.stb} subprojects/stb cp -r ${inputs.stb} subprojects/stb
chmod -R u+w subprojects/ chmod -R u+w subprojects/
cp subprojects/packagefiles/stb/meson.build subprojects/stb/meson.build cp subprojects/packagefiles/stb/meson.build subprojects/stb/meson.build
# simdutf
cp -r ${inputs.simdutf} subprojects/simdutf
chmod -R u+w subprojects/simdutf
cp subprojects/packagefiles/simdutf/meson.build subprojects/simdutf/meson.build
cp subprojects/packagefiles/simdutf/meson.options subprojects/simdutf/meson.options
''; '';
buildInputs = with pkgs; [ buildInputs = with pkgs; [
@ -96,7 +113,7 @@
meta = { meta = {
description = "4JCraft"; description = "4JCraft";
platforms = pkgs.lib.platforms.linux; platforms = pkgs.lib.platforms.unix;
}; };
}; };
}); });