colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "rustPlatform.bindgenHook: use the same clang/libclang as rustc"

Browse Source 
This reverts commit 46ee37ca1d, as it breaks
anything that uses libcxx on Darwin, as well as cross-compilation to at
least armv6l.

As there's no clear solution at this time, reverting it is the best
option, as this only reduces build time closure size (something we can
arguably live with).

https://github.com/NixOS/nixpkgs/pull/207352#issuecomment-1418363441
https://github.com/NixOS/nixpkgs/pull/207352#issuecomment-1420124250
This commit is contained in:
Winter 2023-02-06 23:55:27 -05:00
parent bf9771c95f
commit e2b092fc52
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/build-support/rust/hooks/default.nix
View File

@ -2,6 +2,7 @@
, callPackage
, cargo
, cargo-nextest
, clang
, lib
, makeSetupHook
, maturin
@ -126,8 +127,8 @@ in {
bindgenHook = callPackage ({}: makeSetupHook {
name = "rust-bindgen-hook";
substitutions = {
libclang = rustc.llvmPackages.clang.cc.lib;
clang = rustc.llvmPackages.clang;
libclang = clang.cc.lib;
inherit clang;
};
}
./rust-bindgen-hook.sh) {};