diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-07 06:01:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-07 06:01:28 +0000 |
| commit | 41e5bd55d51de3aee3bd454e9318e79c3d3fa5f1 (patch) | |
| tree | fca785917fc4101730469c7fb33ad0181bc11d36 /pkgs/build-support | |
| parent | b30088fc3fdf6294c457a0184ffb9967f29d389e (diff) | |
| parent | 9e22cf8881c8bc2bffd623d1cc10ad3c2cd67797 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/rust/hooks/default.nix | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index c539d671e9838..5bffa2b2050f5 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -1,7 +1,5 @@ { lib, callPackage, runCommandLocal, writeShellScriptBin, glibc, pkgsi686Linux, coreutils, bubblewrap }: -let buildFHSEnv = callPackage ./env.nix { }; in - args @ { name , runScript ? "bash" diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index 13562acd54925..9989e582d2e9a 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -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) {}; |