Revert "rustPlatform.bindgenHook: use the same clang/libclang as rustc"
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:
parent
bf9771c95f
commit
e2b092fc52
|
@ -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) {};
|
||||
|
|
Loading…
Reference in a new issue