Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

cargo-tauri: 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

(cherry picked from commit 57d00f085573f1bf3efc6e39481686c5abe86f9c)

authored by Seth Flynn and committed by github-actions[bot] b341ff4e b1b32914

Changed files
+22 -11
pkgs
by-name
ca
cargo-tauri
cargo-tauri_1
+19 -11
pkgs/by-name/ca/cargo-tauri/package.nix
··· 1 1 { 2 2 lib, 3 3 stdenv, 4 + bzip2, 4 5 callPackage, 5 6 rustPlatform, 6 7 fetchFromGitHub, 7 - gtk4, 8 8 nix-update-script, 9 - openssl, 10 9 pkg-config, 11 - webkitgtk_4_1, 10 + xz, 11 + zstd, 12 12 }: 13 13 14 14 rustPlatform.buildRustPackage rec { ··· 24 24 25 25 cargoHash = "sha256-nkY1ydc2VewRwY+B5nR68mz8Ff3FK1KoHE4dLzNtPkY="; 26 26 27 - nativeBuildInputs = [ pkg-config ]; 28 - 29 - buildInputs = [ 30 - openssl 31 - ] 32 - ++ lib.optionals stdenv.hostPlatform.isLinux [ 33 - gtk4 34 - webkitgtk_4_1 27 + nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [ 28 + pkg-config 35 29 ]; 36 30 31 + buildInputs = 32 + # Required for tauri-macos-sign and RPM support in tauri-bundler 33 + lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [ 34 + bzip2 35 + xz 36 + ] 37 + ++ lib.optionals stdenv.hostPlatform.isLinux [ 38 + zstd 39 + ]; 40 + 37 41 cargoBuildFlags = [ "--package tauri-cli" ]; 38 42 cargoTestFlags = cargoBuildFlags; 43 + 44 + env = lib.optionalAttrs stdenv.hostPlatform.isLinux { 45 + ZSTD_SYS_USE_PKG_CONFIG = true; 46 + }; 39 47 40 48 passthru = { 41 49 # See ./doc/hooks/tauri.section.md
+3
pkgs/by-name/ca/cargo-tauri_1/package.nix
··· 8 8 gtk3, 9 9 libsoup_2_4, 10 10 openssl, 11 + pkg-config, 11 12 webkitgtk_4_0, 12 13 }: 13 14 ··· 35 36 ; 36 37 hash = "sha256-t5sR02qC06H7A2vukwyZYKA2XMVUzJrgIOYuNSf42mE="; 37 38 }; 39 + 40 + nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [ pkg-config ]; 38 41 39 42 buildInputs = [ 40 43 openssl