fix gltfpack not found for nix build

icewind1991 · Dec 26, 2023 · 1161fcf · 1161fcf
1 parent 0249988
commit 1161fcf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/flake.nix b/flake.nix
@@ -102,8 +102,8 @@
                pname = "vbsp-server";
                preConfigure = ''
                 cargo_build_options="--features server $cargo_build_options"
-              '';
-              buildInputs = with pkgs; [meshoptimizer];
+               '';
+               GLTFPACK = "${pkgs.meshoptimizer}/bin/gltfpack";
             });
           assets = pkgs.fetchSteam {
             name = "tf2-vpks";

diff --git a/src/server/pack.rs b/src/server/pack.rs
@@ -10,7 +10,9 @@ pub async fn pack(map: &str, data: &[u8]) -> Result<Vec<u8>> {
 
     input.write_all(data).await?;
 
-    let out = Command::new("gltfpack")
+    let pack_cmd = option_env!("GLTFPACK").unwrap_or("gltfpack");
+
+    let out = Command::new(pack_cmd)
         .arg("-kn")
         .arg("-mm")
         .arg("-tc")