Merge pull request #1690 from A-Walrus/fix_nix

Fix nix flake
hannobraun · Mar 16, 2023 · 4cbda3f · 4cbda3f
2 parents fe28af5 + 22d54d2
commit 4cbda3f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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
@@ -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]}";
         };
       });
 }