Skip to content

Commit f32658f

Browse files
committed
add tauri
1 parent c553921 commit f32658f

27 files changed

+4493
-58
lines changed

Cargo.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dioxus-logger = "0.5.1"
1818
log = "0.4.6"
1919
chrono = "0.4"
2020
rfd = "0.15.0"
21-
brotli = "7.0.0"
21+
brotli = "6.0.0"
2222
base64 = "0.22.1"
2323
webp = "0.3"
2424
rand = "0.8.5"
@@ -29,7 +29,7 @@ qrcode = "0.14.1"
2929
usvg = "0.44.0"
3030
resvg = "0.44.0"
3131
tiny-skia = "0.11.4"
32-
tauri = "2.0.1"
32+
3333

3434
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
3535
dioxus = { version = "0.5", features = ["desktop", "router"] }
@@ -51,6 +51,3 @@ js-sys = "0.3.70"
5151

5252
[target.'cfg(all(target_os = "linux", not(target_arch = "wasm32")))'.dependencies]
5353
wl-clipboard-rs = "0.9.0"
54-
55-
[workspace]
56-
members = ["src-tauri"]

flake.nix

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
};
2121
in
2222
{
23-
# Default devShell
23+
# for github actions devShell
2424
devShells.custom = pkgs.mkShell {
2525
buildInputs = with pkgs; [
2626
rustToolchain
@@ -97,7 +97,7 @@
9797
'';
9898
};
9999

100-
# Custom devShell
100+
# default devShell
101101
devShells.default = pkgs.mkShell {
102102
buildInputs = with pkgs; [
103103
rustToolchain
@@ -122,7 +122,6 @@
122122
libayatana-appindicator
123123
librsvg
124124
gtk3
125-
webkitgtk
126125
glib
127126
cairo
128127
pango
@@ -138,6 +137,7 @@
138137
xorg.libXinerama
139138
cups
140139
gmp
140+
webkitgtk_4_1
141141
];
142142

143143
shellHook = ''
@@ -148,7 +148,7 @@
148148
pkgs.libGL
149149
pkgs.libglvnd
150150
pkgs.gtk3
151-
pkgs.webkitgtk
151+
pkgs.webkitgtk_4_1
152152
pkgs.glib
153153
pkgs.cairo
154154
pkgs.pango
@@ -165,7 +165,7 @@
165165
]}
166166
export RUST_BACKTRACE="1"
167167
export PKG_CONFIG_PATH=${pkgs.lib.makeSearchPathOutput "dev" "lib/pkgconfig" [
168-
pkgs.webkitgtk
168+
pkgs.webkitgtk_4_1
169169
pkgs.graphite2
170170
pkgs.xorg.libXft
171171
pkgs.xorg.libXinerama
@@ -174,6 +174,7 @@
174174
]}
175175
export PATH="$HOME/.cargo/bin:$PATH"
176176
177+
177178
echo "Custom Rust WASM development environment with Dioxus ready!"
178179
179180
if ! command -v dx &> /dev/null; then

src-tauri/.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
# Generated by Cargo
22
# will have compiled files and executables
33
/target/
4-
5-
# Generated by Tauri
6-
# will have schema files for capabilities auto-completion
74
/gen/schemas

0 commit comments

Comments
 (0)