nonsensical-dev/zenyx-engine
nonsensical-dev/zenyx-engine
3
0
Fork 1
Code Issues 6 Pull requests 2 Projects 1 Releases Activity Actions

fix: running default Nix package doesnt provide runtime libraries

Browse source
This commit is contained in:
Chance 2025-04-07 14:04:26 -04:00 • committed by BitSyndicate
parent 970e9757c9
commit ead0c12749
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
default.nix
View file

@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
pkg-config pkg-config
] ++ lib.optionals stdenv.targetPlatform.isDarwin [ ] ++ lib.optionals stdenv.targetPlatform.isDarwin [
targetPackages.darwin.apple_sdk.frameworks.CoreServices targetPackages.darwin.apple_sdk.frameworks.CoreServices
]; ];
buildInputs = with targetPackages; [ buildInputs = with targetPackages; [
dav1d dav1d
@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
xorg.libXi xorg.libXi
xorg.libX11 xorg.libX11
xorg.libxcb xorg.libxcb
bash bash
] ++ lib.optionals stdenv.targetPlatform.isDarwin [ ] ++ lib.optionals stdenv.targetPlatform.isDarwin [
makeWrapper makeWrapper
darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.Cocoa
@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec {
darwin.apple_sdk.frameworks.QuartzCore darwin.apple_sdk.frameworks.QuartzCore
]; ];
CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER = CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER =
lib.optionalString stdenv.targetPlatform.isWindows "${stdenv.cc.targetPrefix}gcc"; lib.optionalString stdenv.targetPlatform.isWindows "${stdenv.cc.targetPrefix}gcc";
NIX_LDFLAGS = lib.optionalString stdenv.targetPlatform.isDarwin "-framework CoreFoundation"; NIX_LDFLAGS = lib.optionalString stdenv.targetPlatform.isDarwin "-framework CoreFoundation";
@ -59,6 +59,9 @@ rustPlatform.buildRustPackage rec {
wrapProgram $out/bin/${pname} \ wrapProgram $out/bin/${pname} \
--prefix PATH : ${lib.makeBinPath [ bash ]} \ --prefix PATH : ${lib.makeBinPath [ bash ]} \
--set LD_LIBRARY_PATH ${lib.makeLibraryPath buildInputs} --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/
''; '';
doCheck = false; doCheck = false;

5
flake.nix
View file

@ -66,8 +66,9 @@
]; ];
buildInputs = buildInputs; buildInputs = buildInputs;
shellHook = '' shellHook = ''
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${builtins.toString (pkgs.lib.makeLibraryPath buildInputs)}"; export PATH="$HOME/.cargo/bin:$PATH"
echo "Rust version: $(rustc --version)"; export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${builtins.toString (pkgs.lib.makeLibraryPath buildInputs)}"
echo "Rust version: $(rustc --version)"
''; '';
}; };