From ead0c127494e9991e9a155e23a178dcf0742fd7a Mon Sep 17 00:00:00 2001 From: Chance Date: Mon, 7 Apr 2025 14:04:26 -0400 Subject: [PATCH] fix: running default Nix package doesnt provide runtime libraries --- default.nix | 9 ++++++--- flake.nix | 5 +++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/default.nix b/default.nix index 2a287bb..1ad47e5 100644 --- a/default.nix +++ b/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { pkg-config ] ++ lib.optionals stdenv.targetPlatform.isDarwin [ targetPackages.darwin.apple_sdk.frameworks.CoreServices - ]; + ]; buildInputs = with targetPackages; [ dav1d @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libX11 xorg.libxcb - bash + bash ] ++ lib.optionals stdenv.targetPlatform.isDarwin [ makeWrapper darwin.apple_sdk.frameworks.Cocoa @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { 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"; NIX_LDFLAGS = lib.optionalString stdenv.targetPlatform.isDarwin "-framework CoreFoundation"; @@ -59,6 +59,9 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/${pname} \ --prefix PATH : ${lib.makeBinPath [ bash ]} \ --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; diff --git a/flake.nix b/flake.nix index 99f0a07..2b71e5f 100644 --- a/flake.nix +++ b/flake.nix @@ -66,8 +66,9 @@ ]; buildInputs = buildInputs; shellHook = '' - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${builtins.toString (pkgs.lib.makeLibraryPath buildInputs)}"; - echo "Rust version: $(rustc --version)"; + export PATH="$HOME/.cargo/bin:$PATH" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${builtins.toString (pkgs.lib.makeLibraryPath buildInputs)}" + echo "Rust version: $(rustc --version)" ''; };