mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 21:09:00 +02:00
Merge pull request #250782 from figsoda/xplr
xplr: fix build on aarch64-linux and x86_64-darwin
This commit is contained in:
commit
edf89172b0
|
@ -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 ];
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue