diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index d8f1bfaf4447..f974ff3adc33 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -1,46 +1,48 @@ { lib , stdenv -, atk -, pkg-config -, curl -, darwin -, libgit2 -, gtk3 -, libssh2 -, openssl -, sqlite -, zlib -, dbus -, dbus-glib -, gdk-pixbuf -, cairo -, python3 -, libsodium -, postgresql -, gmp -, gobject-introspection -, foundationdb -, capnproto -, nettle -, gtk4 -, clang -, llvmPackages -, linux-pam -, pango -, cmake -, glib -, freetype -, fontconfig -, rdkafka -, udev -, libevdev , alsa-lib -, graphene -, protobuf +, atk , autoconf , automake +, cairo +, capnproto +, clang +, cmake +, curl +, darwin +, dbus +, dbus-glib +, fontconfig +, foundationdb +, freetype +, gdk-pixbuf +, glib +, gmp +, gobject-introspection +, graphene +, gtk3 +, gtk4 +, libevdev +, libgit2 +, libsodium +, libsoup_3 +, libssh2 , libtool +, linux-pam +, llvmPackages +, nettle +, openssl +, pango +, pkg-config +, postgresql +, protobuf +, python3 +, rdkafka , seatd # =libseat +, sqlite +, udev +, webkitgtk_4_1 +, zlib , ... }: @@ -93,7 +95,10 @@ in nativeBuildInputs = [ pkg-config ] ++ lib.optionals (stdenv.buildPlatform.config != stdenv.hostPlatform.config) [ - python3 autoconf automake libtool + python3 + autoconf + automake + libtool ]; buildInputs = [ libevdev ]; @@ -132,21 +137,34 @@ in }; gobject-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus-glib ]; }; gio-sys = attrs: { - buildInputs = [ dbus-glib ]; - }; - - gdk-pixbuf-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus-glib ]; }; gdk-pixbuf = attrs: { + buildInputs = [ dbus-glib gdk-pixbuf ]; + }; + + gdk-pixbuf-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gdk-pixbuf ]; }; + gdk-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk3 ]; # libgdk-3 + }; + + gdkx11-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk3 ]; + }; + gtk-sys = attrs: { buildInputs = [ gtk3 ]; nativeBuildInputs = [ pkg-config ]; @@ -203,6 +221,11 @@ in buildInputs = [ graphene ]; }; + javascriptcore-rs-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ webkitgtk_4_1 ]; + }; + nettle-sys = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ nettle clang ]; @@ -302,6 +325,11 @@ in buildInputs = [ freetype fontconfig ]; }; + soup3-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libsoup_3 ]; + }; + thrussh-libsodium = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsodium ]; @@ -311,6 +339,11 @@ in nativeBuildInputs = [ protobuf ]; }; + webkit2gtk-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ webkitgtk_4_1 ]; + }; + xcb = attrs: { buildInputs = [ python3 ]; };