From 9e3825de8dbe84ae96c09000bc73ea1b82e7529b Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 9 Jul 2024 18:12:38 +0300 Subject: [PATCH] defaultCrateOverrides: add extraLinkFlags to zlib These libraries need zlib, and otherwise cause a linker error when linking the final crate of a tauri/wry project. --- pkgs/build-support/rust/default-crate-overrides.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index f974ff3adc33..1aebfe60a8d2 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -62,6 +62,7 @@ in cairo-sys-rs = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo ]; + extraLinkFlags = [ "-L${zlib.out}/lib" ]; }; capnp-rpc = attrs: { @@ -134,6 +135,7 @@ in glib-sys = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ]; + extraLinkFlags = [ "-L${zlib.out}/lib" ]; }; gobject-sys = attrs: { @@ -328,6 +330,7 @@ in soup3-sys = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsoup_3 ]; + extraLinkFlags = [ "-L${zlib.out}/lib" ]; }; thrussh-libsodium = attrs: { @@ -342,6 +345,7 @@ in webkit2gtk-sys = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ webkitgtk_4_1 ]; + extraLinkFlags = [ "-L${zlib.out}/lib" ]; }; xcb = attrs: {