diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-04-09 06:01:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-09 06:01:16 +0000 |
| commit | fc0616b73d61c71eae7159dc43fdd957ae98480d (patch) | |
| tree | e661b7336b1ab5179b26d7e41e39b2a28f429fb7 /pkgs/build-support/rust | |
| parent | 784711eb6398f36aee36109702d7948168c621c8 (diff) | |
| parent | c5cf2117f838837099d853bd3283ec21972df583 (diff) | |
| download | nixpkgs-fc0616b73d61c71eae7159dc43fdd957ae98480d.tar nixpkgs-fc0616b73d61c71eae7159dc43fdd957ae98480d.tar.gz nixpkgs-fc0616b73d61c71eae7159dc43fdd957ae98480d.tar.bz2 nixpkgs-fc0616b73d61c71eae7159dc43fdd957ae98480d.tar.lz nixpkgs-fc0616b73d61c71eae7159dc43fdd957ae98480d.tar.xz nixpkgs-fc0616b73d61c71eae7159dc43fdd957ae98480d.tar.zst nixpkgs-fc0616b73d61c71eae7159dc43fdd957ae98480d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support/rust')
| -rw-r--r-- | pkgs/build-support/rust/default-crate-overrides.nix | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 441c6dfaf9c..ce8217b403e 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -36,6 +36,9 @@ , alsa-lib , graphene , protobuf +, autoconf +, automake +, libtool , ... }: @@ -85,8 +88,17 @@ in }; evdev-sys = attrs: { - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ] ++ lib.optionals (stdenv.buildPlatform.config != stdenv.hostPlatform.config) [ + python3 autoconf automake libtool + ]; buildInputs = [ libevdev ]; + + # This prevents libevdev's build.rs from trying to `git fetch` when HOST!=TARGET + prePatch = '' + touch libevdev/.git + ''; }; expat-sys = attrs: { |