From ec58e59400b72cedaa7382ae9bedd1d20ad9b3a8 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 22 Aug 2023 11:57:51 -0400 Subject: [PATCH 1/2] xplr: fix build on aarch64-linux and x86_64-darwin --- .../applications/file-managers/xplr/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/file-managers/xplr/default.nix b/pkgs/applications/file-managers/xplr/default.nix index 4885783abaca..9db9dc51b6db 100644 --- a/pkgs/applications/file-managers/xplr/default.nix +++ b/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,14 +11,17 @@ 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"; From 697252e4d7277306bdadce75e06176f2e156746e Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 22 Aug 2023 11:58:36 -0400 Subject: [PATCH 2/2] xplr: add figsoda to maintainers --- pkgs/applications/file-managers/xplr/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/file-managers/xplr/default.nix b/pkgs/applications/file-managers/xplr/default.nix index 9db9dc51b6db..5f058f2baf3e 100644 --- a/pkgs/applications/file-managers/xplr/default.nix +++ b/pkgs/applications/file-managers/xplr/default.nix @@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec { 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 ]; }; }