Merge pull request #265956 from figsoda/felix

felix-fm: fix build on darwin

authored by

Weijia Wang and committed by
GitHub
4212c65b dd3db149

+8 -5
+8 -5
pkgs/applications/file-managers/felix-fm/default.nix
··· 3 , fetchFromGitHub 4 , pkg-config 5 , bzip2 6 , zstd 7 , zoxide 8 }: ··· 24 25 buildInputs = [ 26 bzip2 27 zstd 28 ]; 29 30 nativeCheckInputs = [ zoxide ]; 31 32 buildFeatures = [ "zstd/pkg-config" ]; 33 ··· 36 "--skip=functions::tests::test_list_up_contents" 37 "--skip=state::tests::test_has_write_permission" 38 ]; 39 - 40 - # Cargo.lock is outdated 41 - postConfigure = '' 42 - cargo metadata --offline 43 - ''; 44 45 meta = with lib; { 46 description = "A tui file manager with vim-like key mapping";
··· 3 , fetchFromGitHub 4 , pkg-config 5 , bzip2 6 + , libgit2 7 + , zlib 8 , zstd 9 , zoxide 10 }: ··· 26 27 buildInputs = [ 28 bzip2 29 + libgit2 30 + zlib 31 zstd 32 ]; 33 34 nativeCheckInputs = [ zoxide ]; 35 + 36 + env = { 37 + ZSTD_SYS_USE_PKG_CONFIG = true; 38 + }; 39 40 buildFeatures = [ "zstd/pkg-config" ]; 41 ··· 44 "--skip=functions::tests::test_list_up_contents" 45 "--skip=state::tests::test_has_write_permission" 46 ]; 47 48 meta = with lib; { 49 description = "A tui file manager with vim-like key mapping";