diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-10-28 00:01:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-28 00:01:36 +0000 |
| commit | a1e570b43e4517b0a787de2a81159a7e7ec25130 (patch) | |
| tree | 07f363cc8255d0339e924caf9af46f2348e62587 /pkgs/build-support/rust | |
| parent | 22401dcc39cbca3998fc81165331cdccc23ee2b8 (diff) | |
| parent | 8f6f42bd36ff0167d8041c1c047440627dd2d171 (diff) | |
| download | nixpkgs-a1e570b43e4517b0a787de2a81159a7e7ec25130.tar nixpkgs-a1e570b43e4517b0a787de2a81159a7e7ec25130.tar.gz nixpkgs-a1e570b43e4517b0a787de2a81159a7e7ec25130.tar.bz2 nixpkgs-a1e570b43e4517b0a787de2a81159a7e7ec25130.tar.lz nixpkgs-a1e570b43e4517b0a787de2a81159a7e7ec25130.tar.xz nixpkgs-a1e570b43e4517b0a787de2a81159a7e7ec25130.tar.zst nixpkgs-a1e570b43e4517b0a787de2a81159a7e7ec25130.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support/rust')
| -rw-r--r-- | pkgs/build-support/rust/default-crate-overrides.nix | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 4050afe8dde..841cad09efa 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -22,7 +22,11 @@ , clang , llvmPackages , linux-pam +, cmake +, glib +, freetype , rdkafka +, udev , ... }: @@ -61,6 +65,10 @@ in buildInputs = [ dbus ]; }; + expat-sys = attrs: { + nativeBuildInputs = [ cmake ]; + }; + foundationdb-sys = attrs: { buildInputs = [ foundationdb ]; # needed for 0.4+ release, when the FFI bindings are auto-generated @@ -75,6 +83,16 @@ in buildInputs = [ foundationdb ]; }; + freetype-sys = attrs: { + nativeBuildInputs = [ cmake ]; + buildInputs = [ freetype ]; + }; + + glib-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ glib ]; + }; + gobject-sys = attrs: { buildInputs = [ dbus-glib ]; }; @@ -112,6 +130,11 @@ in buildInputs = [ dbus ]; }; + libudev-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ udev ]; + }; + nettle-sys = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ nettle clang ]; @@ -184,6 +207,11 @@ in buildInputs = lib.optional stdenv.isDarwin Security; }; + servo-fontconfig-sys = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ freetype ]; + }; + thrussh-libsodium = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsodium ]; |