From 1f9e69f7535e03f12e103bf2a655681a9cca6955 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 21 Aug 2025 19:08:00 -0400 Subject: [PATCH] cargo-tauri_1: cleanup dependencies This removes the {,webkit}gtk dependencies that aren't directly used by the CLI, while explicitly declaring the some dependencies that were previously being pulled in through {,webkit}gtk or just vendored by crates --- pkgs/by-name/ca/cargo-tauri_1/package.nix | 26 ++++++++++++----------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ca/cargo-tauri_1/package.nix b/pkgs/by-name/ca/cargo-tauri_1/package.nix index 9c82a73ca686..0facf494764b 100644 --- a/pkgs/by-name/ca/cargo-tauri_1/package.nix +++ b/pkgs/by-name/ca/cargo-tauri_1/package.nix @@ -1,14 +1,13 @@ { lib, stdenv, - rustPlatform, + bzip2, fetchFromGitHub, - cargo-tauri, - gtk3, - libsoup_2_4, - openssl, pkg-config, - webkitgtk_4_0, + rustPlatform, + xz, + zstd, + cargo-tauri, }: cargo-tauri.overrideAttrs ( @@ -39,13 +38,16 @@ cargo-tauri.overrideAttrs ( nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [ pkg-config ]; buildInputs = [ - openssl + # Required by `zip` in `tauri-bundler` + bzip2 + zstd ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - gtk3 - libsoup_2_4 - webkitgtk_4_0 - ]; + # Required by `rpm` in `tauri-bundler` + ++ lib.optionals stdenv.hostPlatform.isLinux [ xz ]; + + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + }; passthru = { inherit (oldAttrs.passthru) hook;