diff options
author | figsoda <figsoda@pm.me> | 2023-08-22 11:57:51 -0400 |
---|---|---|
committer | figsoda <figsoda@pm.me> | 2023-08-22 11:58:33 -0400 |
commit | ec58e59400b72cedaa7382ae9bedd1d20ad9b3a8 (patch) | |
tree | 378015442beaa0102c8c4d140ee8fc57efd48950 /pkgs/applications/file-managers | |
parent | 044b56eb42730951627bbb7369bc7b2278207dec (diff) |
xplr: fix build on aarch64-linux and x86_64-darwin
Diffstat (limited to 'pkgs/applications/file-managers')
-rw-r--r-- | pkgs/applications/file-managers/xplr/default.nix | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/applications/file-managers/xplr/default.nix b/pkgs/applications/file-managers/xplr/default.nix index 4885783abacad..9db9dc51b6db2 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"; |