diff --git a/flake.lock b/flake.lock index 365837657..0f6e9ef3b 100644 --- a/flake.lock +++ b/flake.lock @@ -65,6 +65,7 @@ "miniaudio-patch": "miniaudio-patch", "nixpkgs": "nixpkgs", "shiggy": "shiggy", + "simdutf": "simdutf", "stb": "stb" } }, @@ -85,6 +86,22 @@ "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": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 543ce24d6..04fa60509 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,10 @@ url = "github:nothings/stb/master"; flake = false; }; + simdutf = { + url = "github:simdutf/simdutf"; + flake = false; + }; }; outputs = { self, nixpkgs, ... } @ inputs: @@ -48,7 +52,10 @@ dontUseCmakeConfigure = true; preConfigure = '' + # shiggy cp -r ${inputs.shiggy} subprojects/shiggy + + # miniaudio cp -r ${inputs.miniaudio} subprojects/miniaudio chmod -R u+w subprojects/miniaudio unzip ${inputs."miniaudio-patch"} -d /tmp/miniaudio-patch/ @@ -60,10 +67,20 @@ [provide] dependency_names = miniaudio EOF + + # 4jlibs cp -r ${inputs."4jlibs"} subprojects/4jlibs + + # stb cp -r ${inputs.stb} subprojects/stb chmod -R u+w subprojects/ 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; [ @@ -96,7 +113,7 @@ meta = { description = "4JCraft"; - platforms = pkgs.lib.platforms.linux; + platforms = pkgs.lib.platforms.unix; }; }; });