fix(nix): incorrect namespace for vulkan-loader
, add cargo-zigbuild
Some checks failed
Build Zenyx ⚡ / 🏗️ Build aarch64-apple-darwin (push) Has been cancelled
Build Zenyx ⚡ / 🏗️ Build aarch64-pc-windows-msvc (push) Has been cancelled
Build Zenyx ⚡ / 🏗️ Build aarch64-unknown-linux-gnu (push) Has been cancelled
Build Zenyx ⚡ / 🏗️ Build x86_64-apple-darwin (push) Has been cancelled
Build Zenyx ⚡ / 🏗️ Build x86_64-pc-windows-msvc (push) Has been cancelled
Build Zenyx ⚡ / 🏗️ Build x86_64-unknown-linux-gnu (push) Has been cancelled
Build Zenyx ⚡ / 🧪 Run Cargo Tests (push) Has been cancelled
Some checks failed
Build Zenyx ⚡ / 🏗️ Build aarch64-apple-darwin (push) Has been cancelled
Build Zenyx ⚡ / 🏗️ Build aarch64-pc-windows-msvc (push) Has been cancelled
Build Zenyx ⚡ / 🏗️ Build aarch64-unknown-linux-gnu (push) Has been cancelled
Build Zenyx ⚡ / 🏗️ Build x86_64-apple-darwin (push) Has been cancelled
Build Zenyx ⚡ / 🏗️ Build x86_64-pc-windows-msvc (push) Has been cancelled
Build Zenyx ⚡ / 🏗️ Build x86_64-unknown-linux-gnu (push) Has been cancelled
Build Zenyx ⚡ / 🧪 Run Cargo Tests (push) Has been cancelled
This commit is contained in:
parent
2d704652b5
commit
131989d9f3
2 changed files with 4 additions and 3 deletions
|
@ -13,7 +13,7 @@
|
||||||
stdenv,
|
stdenv,
|
||||||
targetPackages ? pkgs,
|
targetPackages ? pkgs,
|
||||||
}: let
|
}: let
|
||||||
version = (builtins.fromTOML (builtins.readFile ./engine/Cargo.toml)).package.version;
|
version = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.version;
|
||||||
src = nix-gitignore.gitignoreSource [] ./.;
|
src = nix-gitignore.gitignoreSource [] ./.;
|
||||||
in
|
in
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
|
@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
--set LD_LIBRARY_PATH ${lib.makeLibraryPath buildInputs}
|
--set LD_LIBRARY_PATH ${lib.makeLibraryPath buildInputs}
|
||||||
'' + lib.optionalString stdenv.targetPlatform.isWindows ''
|
'' + lib.optionalString stdenv.targetPlatform.isWindows ''
|
||||||
mkdir -p $out/bin
|
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;
|
doCheck = false;
|
||||||
|
@ -72,4 +72,4 @@ rustPlatform.buildRustPackage rec {
|
||||||
platforms = lib.platforms.all;
|
platforms = lib.platforms.all;
|
||||||
mainProgram = "zenyx";
|
mainProgram = "zenyx";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,6 +41,7 @@
|
||||||
cargo-cross
|
cargo-cross
|
||||||
cargo-xwin
|
cargo-xwin
|
||||||
cargo-wizard
|
cargo-wizard
|
||||||
|
cargo-zigbuild
|
||||||
wine64
|
wine64
|
||||||
pkg-config
|
pkg-config
|
||||||
];
|
];
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue