Merge master into staging-next

2021-05-11 12:24:28 +00:00
parent 10e16ec9ab 5e7fe16211
commit 1e7a48b474
22 changed files with 903 additions and 98 deletions
--- a/pkgs/applications/misc/xplr/default.nix
+++ b/pkgs/applications/misc/xplr/default.nix
@@ -1,4 +1,4 @@
-{ lib, rustPlatform, fetchFromGitHub }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv }:

 rustPlatform.buildRustPackage rec {
  pname = "xplr";
@@ -11,6 +11,8 @@ rustPlatform.buildRustPackage rec {
    sha256 = "00kmmdwwf9cll25bkszgin2021ggf9b28jlcpicin5kgw4iwlhkj";
  };

+  buildInputs = lib.optional stdenv.isDarwin libiconv;
+
  cargoSha256 = "1j43vwb885h355wdmjijz1qpkqn1dmb93hwi6vc035vkbbxs1g4r";

  meta = with lib; {