Merge pull request 'fix(ci): enable libsodium pkg-config feature across all platforms' (#104) from fix/libsodium-use-pkg-config into beta

Reviewed-on: #104

.gitea/workflows/auto-tag.yml

@@ -444,9 +444,8 @@ jobs:
           CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER: x86_64-w64-mingw32-gcc
           OPENSSL_NO_VENDOR: "0"
           OPENSSL_STATIC: "1"
-          SODIUM_LIB_DIR: /usr/x86_64-w64-mingw32/lib
+          PKG_CONFIG_x86_64_pc_windows_gnu: x86_64-w64-mingw32-pkg-config
-          SODIUM_STATIC: "1"
+          PKG_CONFIG_ALLOW_CROSS: "1"
-          SODIUM_USE_PKG_CONFIG: "no"
         run: |
           npm ci --legacy-peer-deps
           CI=true npx tauri build --target x86_64-pc-windows-gnu

.gitea/workflows/test.yml

@@ -45,6 +45,7 @@ jobs:
             libayatana-appindicator3-dev \
             librsvg2-dev \
             libdbus-1-dev \
+            libsodium-dev \
             pkg-config
       - name: Install Rust components
         run: rustup component add rustfmt
@@ -96,6 +97,7 @@ jobs:
             libayatana-appindicator3-dev \
             librsvg2-dev \
             libdbus-1-dev \
+            libsodium-dev \
             pkg-config
       - name: Install clippy
         run: rustup component add clippy
@@ -133,6 +135,7 @@ jobs:
             libayatana-appindicator3-dev \
             librsvg2-dev \
             libdbus-1-dev \
+            libsodium-dev \
             pkg-config
       - run: cargo test --manifest-path src-tauri/Cargo.toml -- --test-threads=1
 

src-tauri/Cargo.lock

@@ -6545,6 +6545,7 @@ dependencies = [
  "http 1.4.1",
  "infer 0.15.0",
  "lazy_static",
+ "libsodium-sys-stable",
  "lopdf",
  "mockito",
  "portable-pty",

src-tauri/Cargo.toml

@@ -59,6 +59,7 @@ http = "1.4"
 flate2 = { version = "1", features = ["rust_backend"] }
 serde_yaml = "0.9"
 portable-pty = "0.8"
+libsodium-sys-stable = { version = "1.24", features = ["use-pkg-config"] }