Merge remote-tracking branch 'upstream/staging-next' into staging

2021-05-11 22:30:46 +00:00
parent 912c8262b4 ec97081437
commit cf02b24813
47 changed files with 566 additions and 139 deletions
--- a/pkgs/tools/security/bitwarden_rs/default.nix
+++ b/pkgs/tools/security/bitwarden_rs/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, rustPlatform, fetchFromGitHub, nixosTests
 , pkg-config, openssl
-, Security, CoreServices
+, libiconv, Security, CoreServices
 , dbBackend ? "sqlite", libmysqlclient, postgresql }:

 let
@@ -19,7 +19,7 @@ in rustPlatform.buildRustPackage rec {

  nativeBuildInputs = [ pkg-config ];
  buildInputs = with lib; [ openssl ]
-    ++ optionals stdenv.isDarwin [ Security CoreServices ]
+    ++ optionals stdenv.isDarwin [ libiconv Security CoreServices ]
    ++ optional (dbBackend == "mysql") libmysqlclient
    ++ optional (dbBackend == "postgresql") postgresql;