From 7d7fbf027802fea876a88a70ca8d66d2665dbbf6 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 6 Nov 2023 18:10:30 -0500 Subject: [PATCH 1/2] felix-fm: fix build on darwin --- pkgs/applications/file-managers/felix-fm/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index 6f30c52261aa..60e40b9f6299 100644 --- a/pkgs/applications/file-managers/felix-fm/default.nix +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , pkg-config , bzip2 +, libgit2 +, zlib , zstd , zoxide }: @@ -24,11 +26,17 @@ rustPlatform.buildRustPackage rec { buildInputs = [ bzip2 + libgit2 + zlib zstd ]; nativeCheckInputs = [ zoxide ]; + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + buildFeatures = [ "zstd/pkg-config" ]; checkFlags = [ From 99e0037930b212dac77357c42481d87ff15eb70b Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 6 Nov 2023 18:10:43 -0500 Subject: [PATCH 2/2] felix-fm: remove unused patch --- pkgs/applications/file-managers/felix-fm/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index 60e40b9f6299..04491de0fd9f 100644 --- a/pkgs/applications/file-managers/felix-fm/default.nix +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -45,11 +45,6 @@ rustPlatform.buildRustPackage rec { "--skip=state::tests::test_has_write_permission" ]; - # Cargo.lock is outdated - postConfigure = '' - cargo metadata --offline - ''; - meta = with lib; { description = "A tui file manager with vim-like key mapping"; homepage = "https://github.com/kyoheiu/felix";