Merge master into staging-next

2021-05-10 12:24:32 +00:00
parent f4d69ad1f2 acd5e6707e
commit 115881e756
23 changed files with 315 additions and 259 deletions
--- a/pkgs/development/tools/rust/cargo-limit/default.nix
+++ b/pkgs/development/tools/rust/cargo-limit/default.nix
@@ -2,6 +2,8 @@
 , rustPlatform
 , fetchFromGitHub
 , nix-update-script
+, stdenv
+, libiconv
 }:

 rustPlatform.buildRustPackage rec {
@@ -17,6 +19,8 @@ rustPlatform.buildRustPackage rec {

  cargoSha256 = "sha256-LxqxRtMKUKZeuvk1caoYy8rv1bkEOQBM8i5SXMF4GXc=";

+  buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
+
  passthru = {
    updateScript = nix-update-script {
      attrPath = pname;