Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/build-support/go/module.nix

1 files changed, 12 insertions, 8 deletions

diff --git a/nixpkgs/pkgs/applications/file-managers/xplr/default.nix b/nixpkgs/pkgs/applications/file-managers/xplr/default.nix
index 4885783abaca..5f058f2baf3e 100644
--- a/nixpkgs/pkgs/applications/file-managers/xplr/default.nix
+++ b/nixpkgs/pkgs/applications/file-managers/xplr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
   pname = "xplr";
@@ -11,19 +11,23 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-lqFhLCOLiuSQWhbcZUEj2xFRlZ+x1ZTVc8IJw7tJjhE=";
   };
 
-  buildInputs = lib.optional stdenv.isDarwin libiconv;
-
   cargoHash = "sha256-3hrpg2cMvIuFy6mH1/1igIpU4nbzFQLCAhiIRZbTuaI=";
 
-  checkFlags = [
-    # failure: path::tests::test_relative_to_parent
-    "--skip=path::tests::test_relative_to_parent"
-  ];
+  # fixes `thread 'main' panicked at 'cannot find strip'` on x86_64-darwin
+  env = lib.optionalAttrs (stdenv.isx86_64 && stdenv.isDarwin) {
+    TARGET_STRIP = "${stdenv.cc.targetPrefix}strip";
+  };
+
+  # error: linker `aarch64-linux-gnu-gcc` not found
+  postPatch = ''
+    rm .cargo/config
+  '';
 
   meta = with lib; {
     description = "A hackable, minimal, fast TUI file explorer";
     homepage = "https://xplr.dev";
+    changelog = "https://github.com/sayanarijit/xplr/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ sayanarijit suryasr007 thehedgeh0g mimame ];
+    maintainers = with maintainers; [ sayanarijit suryasr007 thehedgeh0g mimame figsoda ];
   };
 }