fix(nix): incorrect namespace for vulkan-loader, add cargo-zigbuild

This commit is contained in:
lily 2025-04-23 17:42:45 -04:00
parent 2d704652b5
commit 131989d9f3
Signed by untrusted user: lily
GPG key ID: 601F3263FBCBC4B9
2 changed files with 4 additions and 3 deletions

View file

@ -13,7 +13,7 @@
stdenv,
targetPackages ? pkgs,
}: let
version = (builtins.fromTOML (builtins.readFile ./engine/Cargo.toml)).package.version;
version = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.version;
src = nix-gitignore.gitignoreSource [] ./.;
in
rustPlatform.buildRustPackage rec {
@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec {
--set LD_LIBRARY_PATH ${lib.makeLibraryPath buildInputs}
'' + lib.optionalString stdenv.targetPlatform.isWindows ''
mkdir -p $out/bin
cp ${targetPackages.vulkan-loader}/bin/vulkan-1.dll $out/bin/
cp ${pkgs.vulkan-loader}/bin/vulkan-1.dll $out/bin/
'';
doCheck = false;
@ -72,4 +72,4 @@ rustPlatform.buildRustPackage rec {
platforms = lib.platforms.all;
mainProgram = "zenyx";
};
}
}

View file

@ -41,6 +41,7 @@
cargo-cross
cargo-xwin
cargo-wizard
cargo-zigbuild
wine64
pkg-config
];