Skip to content

Commit bb126bd

Browse files
committed
clean up
1 parent a3f1871 commit bb126bd

File tree

4 files changed

+27
-23
lines changed

4 files changed

+27
-23
lines changed

crates.nix

+10-2
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,13 @@ let
9393

9494
nativeBuildInputs =
9595
(with pkgs; [
96+
alsa-lib.dev
9697
capnproto
9798
cargo-component
99+
libxkbcommon.dev
100+
openssl.dev
101+
udev.dev
102+
wayland.dev
98103
])
99104
++ [ wac-cli ]
100105
++ commonNativeBuildInputs;
@@ -157,14 +162,17 @@ let
157162
buildInputs = lib.optionals pkgs.stdenv.isLinux (
158163
with pkgs;
159164
[
160-
alsa-lib
161165
openssl
162166
udev
163167
]
164168
);
165169

166170
nativeBuildInputs =
167-
(with pkgs; [ capnproto ])
171+
(with pkgs; [
172+
capnproto
173+
openssl.dev
174+
udev.dev
175+
])
168176
++ commonNativeBuildInputs
169177
++ lib.optionals pkgs.stdenv.isDarwin (with pkgs; [ darwin.apple_sdk.frameworks.Cocoa ]);
170178

crates/unavi-scripting/src/api/wired/player/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use wasm_bridge::component::{Linker, Resource};
33

44
use crate::{api::utils::RefResource, state::StoreState};
55

6+
#[allow(clippy::module_inception)]
67
mod player;
78
pub mod systems;
89

flake.nix

+15-19
Original file line numberDiff line numberDiff line change
@@ -106,26 +106,22 @@
106106
inherit crates;
107107

108108
apps = crates.apps // deploy.apps;
109-
110109
checks = crates.checks;
111-
packages =
112-
crates.packages
113-
// deploy.packages
114-
// {
115-
githubMatrix = githubMatrix // {
116-
matrix.include = map (
117-
entry:
118-
let
119-
split = pkgs.lib.strings.splitString "." entry.attr;
120-
package = pkgs.lib.strings.removeSuffix "\"" (
121-
pkgs.lib.strings.removePrefix "\"" (builtins.elemAt split 1)
122-
);
123-
platform = builtins.elemAt split 0;
124-
in
125-
entry // { name = "${package}.${platform}"; }
126-
) githubMatrix.matrix.include;
127-
};
128-
};
110+
packages = crates.packages // deploy.packages;
111+
112+
githubMatrix = githubMatrix // {
113+
matrix.include = map (
114+
entry:
115+
let
116+
split = pkgs.lib.strings.splitString "." entry.attr;
117+
package = pkgs.lib.strings.removeSuffix "\"" (
118+
pkgs.lib.strings.removePrefix "\"" (builtins.elemAt split 1)
119+
);
120+
platform = builtins.elemAt split 0;
121+
in
122+
entry // { name = "${package}.${platform}"; }
123+
) githubMatrix.matrix.include;
124+
};
129125

130126
devShells.default = craneLib.devShell {
131127
packages =

wasm/test-wired-scene/src/node.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
use crate::{
22
bindings::wired::{
33
log::api::{log, LogLevel},
4-
physics::types::{Collider, RigidBodyType, Shape},
54
scene::{
65
gltf::Gltf,
76
mesh::Mesh,
8-
node::{Node, RigidBody, Transform},
7+
node::{Node, Transform},
98
},
109
},
1110
panic_log,

0 commit comments

Comments
 (0)