Merge staging-next into staging

2021-05-15 18:30:31 +00:00
parent d151b2fb41 f1b78f8618
commit c10600230e
49 changed files with 932 additions and 382 deletions
@@ -1,6 +1,7 @@
 { lib, stdenv
 , fetchFromGitHub
 , rustPlatform
+, libiconv
 , Security
 }:

@@ -17,7 +18,7 @@ rustPlatform.buildRustPackage rec {

  cargoSha256 = "sha256-L1MKoVacVKcpEG2IfS+eENxFZNiSaTDTxfFbFlvzYl8=";

-  buildInputs = lib.optional stdenv.isDarwin Security;
+  buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];

  meta = with lib; {
    description = "A utility that makes sweeping changes to large, shared code bases";