Merge remote-tracking branch 'origin/master' into staging-next

Conflicts: pkgs/tools/package-management/cargo-release/default.nix
2021-05-18 11:03:38 -07:00
parent f7a112f6c4 6bebadb171
commit ca46ad3762
21 changed files with 264 additions and 238 deletions
@@ -9,6 +9,7 @@
 , freetype
 , libxcb
 , python3
+, libiconv
 , AppKit
 , CoreText
 , Security
@@ -29,7 +30,7 @@ rustPlatform.buildRustPackage rec {

  buildInputs = [ llvmPackages.libclang expat freetype ]
    ++ lib.optionals stdenv.isLinux [ libxcb ]
-    ++ lib.optionals stdenv.isDarwin [ AppKit CoreText Security ];
+    ++ lib.optionals stdenv.isDarwin [ libiconv AppKit CoreText Security ];

  nativeBuildInputs = [ cmake pkg-config ]
    ++ lib.optionals stdenv.isLinux [ python3 ];