Skip to content

Commit 6afc26f

Browse files
committed
Tweak shell.nix
- Thanks ChatGPT
1 parent 5c717af commit 6afc26f

File tree

2 files changed

+23
-14
lines changed

2 files changed

+23
-14
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Use included `shell.nix`
2222

2323
## Common steps
2424
```bash
25-
cargo install --locked --version "^2.0" tauri-cli
25+
cargo install --locked --version "^2.0" tauri-cli
2626
cargo install --locked --no-default-features --features update_check,rustls trunk
2727
rustup target add wasm32-unknown-unknown
2828
```

shell.nix

+22-13
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,35 @@ let
44
libPath = with pkgs;
55
lib.makeLibraryPath [
66
pkgs.libayatana-appindicator
7-
# pkgs.libappindicator
7+
# or pkgs.libappindicator
88
];
99
in
1010
pkgs.mkShell rec {
11-
buildInputs = with pkgs; [
12-
clang
13-
gcc
14-
llvmPackages.bintools
15-
rustup
16-
openssl
11+
nativeBuildInputs = with pkgs; [
1712
pkg-config
18-
udev
13+
gobject-introspection
14+
cargo
15+
cargo-tauri
16+
nodejs
17+
];
18+
19+
buildInputs = with pkgs; [
20+
at-spi2-atk
21+
atkmm
22+
cairo
1923
gdk-pixbuf
24+
glib
2025
gtk3
21-
webkitgtk_4_0
26+
harfbuzz
27+
librsvg
2228
libsoup_3
23-
libayatana-appindicator
24-
# libappindicator
25-
xdo
26-
glib
2729
pango
30+
webkitgtk_4_1
31+
openssl
32+
udev
33+
xdo
34+
libayatana-appindicator
35+
# or libappindicator
2836
];
2937
RUSTC_VERSION = overrides.toolchain.channel;
3038
# https://github.com/rust-lang/rust-bindgen#environment-variables
@@ -52,3 +60,4 @@ in
5260
''-I${pkgs.glib.out}/lib/glib-2.0/include/''
5361
];
5462
}
63+

0 commit comments

Comments
 (0)