From 81236c4d7f1b860203fcef17fb1117c95356fe13 Mon Sep 17 00:00:00 2001 From: A-Walrus Date: Thu, 16 Mar 2023 16:01:48 +0200 Subject: [PATCH 1/2] Fix asset_filter Filter that contains regex for files we need at runtime. Updated it with some new filetypes / specific files. --- nix/flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/flake.nix b/nix/flake.nix index dd26737eb..74802e9e7 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -31,7 +31,7 @@ craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain; version = (builtins.fromTOML (builtins.readFile ../Cargo.toml)).workspace.package.version; # Only keeps assets in crates/ (currently shaders and fonts) - assetsFilter = path: _type: (builtins.match ".*(:?wgsl|ttf)$" path) != null; + assetsFilter = path: _type: (builtins.match ".*(:?wgsl|ttf|png|obj|fj.toml|mtl)$" path) != null; filter = path: type: (assetsFilter path type) || (craneLib.filterCargoSources path type); buildInputs = with pkgs; [ pkg-config From 22d54d22abb671d02bfe5f55b3d2b3413ec4d24b Mon Sep 17 00:00:00 2001 From: A-Walrus Date: Thu, 16 Mar 2023 17:40:31 +0200 Subject: [PATCH 2/2] Make export-validator work with nix Provide necessary dependencies for dynamically linked libs (3mf and libstdc++) --- nix/flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/flake.nix b/nix/flake.nix index 74802e9e7..8b3f94924 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -77,7 +77,7 @@ inherit buildInputs; nativeBuildInputs = [ rustToolchain ]; - LD_LIBRARY_PATH = "${nixpkgs.lib.makeLibraryPath [ pkgs.vulkan-loader ]}"; + LD_LIBRARY_PATH = "${nixpkgs.lib.makeLibraryPath [ pkgs.vulkan-loader pkgs.stdenv.cc.cc.lib pkgs.lib3mf]}"; }; }); }