clean up

unavi-xyz · Sep 5, 2024 · bb126bd · bb126bd
1 parent a3f1871
commit bb126bd
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 23 deletions.
diff --git a/crates.nix b/crates.nix
@@ -93,8 +93,13 @@ let
 
     nativeBuildInputs =
       (with pkgs; [
+        alsa-lib.dev
         capnproto
         cargo-component
+        libxkbcommon.dev
+        openssl.dev
+        udev.dev
+        wayland.dev
       ])
       ++ [ wac-cli ]
       ++ commonNativeBuildInputs;
@@ -157,14 +162,17 @@ let
     buildInputs = lib.optionals pkgs.stdenv.isLinux (
       with pkgs;
       [
-        alsa-lib
         openssl
         udev
       ]
     );
 
     nativeBuildInputs =
-      (with pkgs; [ capnproto ])
+      (with pkgs; [
+        capnproto
+        openssl.dev
+        udev.dev
+      ])
       ++ commonNativeBuildInputs
       ++ lib.optionals pkgs.stdenv.isDarwin (with pkgs; [ darwin.apple_sdk.frameworks.Cocoa ]);
 

diff --git a/crates/unavi-scripting/src/api/wired/player/mod.rs b/crates/unavi-scripting/src/api/wired/player/mod.rs
@@ -3,6 +3,7 @@ use wasm_bridge::component::{Linker, Resource};
 
 use crate::{api::utils::RefResource, state::StoreState};
 
+#[allow(clippy::module_inception)]
 mod player;
 pub mod systems;
 

diff --git a/flake.nix b/flake.nix
@@ -106,26 +106,22 @@
         inherit crates;
 
         apps = crates.apps // deploy.apps;
-
         checks = crates.checks;
-        packages =
-          crates.packages
-          // deploy.packages
-          // {
-            githubMatrix = githubMatrix // {
-              matrix.include = map (
-                entry:
-                let
-                  split = pkgs.lib.strings.splitString "." entry.attr;
-                  package = pkgs.lib.strings.removeSuffix "\"" (
-                    pkgs.lib.strings.removePrefix "\"" (builtins.elemAt split 1)
-                  );
-                  platform = builtins.elemAt split 0;
-                in
-                entry // { name = "${package}.${platform}"; }
-              ) githubMatrix.matrix.include;
-            };
-          };
+        packages = crates.packages // deploy.packages;
+
+        githubMatrix = githubMatrix // {
+          matrix.include = map (
+            entry:
+            let
+              split = pkgs.lib.strings.splitString "." entry.attr;
+              package = pkgs.lib.strings.removeSuffix "\"" (
+                pkgs.lib.strings.removePrefix "\"" (builtins.elemAt split 1)
+              );
+              platform = builtins.elemAt split 0;
+            in
+            entry // { name = "${package}.${platform}"; }
+          ) githubMatrix.matrix.include;
+        };
 
         devShells.default = craneLib.devShell {
           packages =

diff --git a/wasm/test-wired-scene/src/node.rs b/wasm/test-wired-scene/src/node.rs
@@ -1,11 +1,10 @@
 use crate::{
     bindings::wired::{
         log::api::{log, LogLevel},
-        physics::types::{Collider, RigidBodyType, Shape},
         scene::{
             gltf::Gltf,
             mesh::Mesh,
-            node::{Node, RigidBody, Transform},
+            node::{Node, Transform},
         },
     },
     panic_log,