Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-04-22 18:14:27 +00:00
committed by GitHub
37 changed files with 229 additions and 405 deletions

View File

@@ -5,6 +5,7 @@
, rust
, rustPlatform
, installShellFiles
, libiconv
, libobjc
, Security
, CoreServices
@@ -28,7 +29,7 @@ rustPlatform.buildRustPackage rec {
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libobjc Security CoreServices Metal Foundation ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv libobjc Security CoreServices Metal Foundation ];
# The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem
# To avoid this we pre-download the file and place it in the locations it will require it in advance