about summary refs log tree commit diff
path: root/pkgs/build-support/rust
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-01-13 18:01:34 +0000
committerGitHub <noreply@github.com>2023-01-13 18:01:34 +0000
commit49722fd14a26ca6a751932949491a87afe592d0d (patch)
tree39ef79595d5b0e4c5cafb3fd7f73e95cd3500d66 /pkgs/build-support/rust
parent54cb39a3f5cd6a1b1138ec8dcc90ffaf7e8f0927 (diff)
parentbefc83905c965adfd33e5cae49acb0351f6e0404 (diff)
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support/rust')
-rw-r--r--pkgs/build-support/rust/default-crate-overrides.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index cc6abdb90d3b7..60b0cfc31c679 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -17,6 +17,7 @@
 , libsodium
 , postgresql
 , gmp
+, gobject-introspection
 , foundationdb
 , capnproto
 , nettle
@@ -28,10 +29,12 @@
 , cmake
 , glib
 , freetype
+, fontconfig
 , rdkafka
 , udev
 , libevdev
 , alsa-lib
+, graphene
 , ...
 }:
 
@@ -81,6 +84,7 @@ in
   };
 
   evdev-sys = attrs: {
+    nativeBuildInputs = [ pkg-config ];
     buildInputs = [ libevdev ];
   };
 
@@ -169,6 +173,11 @@ in
     buildInputs = [ udev ];
   };
 
+  graphene-sys = attrs: {
+    nativeBuildInputs = [ pkg-config ];
+    buildInputs = [ graphene gobject-introspection ];
+  };
+
   nettle-sys = attrs: {
     nativeBuildInputs = [ pkg-config ];
     buildInputs = [ nettle clang ];
@@ -253,7 +262,7 @@ in
 
   servo-fontconfig-sys = attrs: {
     nativeBuildInputs = [ pkg-config ];
-    buildInputs = [ freetype ];
+    buildInputs = [ freetype fontconfig ];
   };
 
   thrussh-libsodium = attrs: {