git.iko.soy/typeable/nixpkgs
on master help sign in
tree-sitter: macOS compatibility
commita63c72212cb63c288a336e0eaf6264aa97c921d7 authorNick Hu <me@nickhu.co.uk> dateMon 9 Nov 2020, 18:41 (6 years ago) parentaea7f1b
2 files changed+7−3
pkgs/development/tools/parsing/tree-sitter/default.nix+4−2 pkgs/top-level/all-packages.nix+3−1
pkgs/development/tools/parsing/tree-sitter/default.nix+4−2
@@ -5,6 +5,7 @@
55, callPackage
66, enableShared ? true
77, enableStatic ? false
8+, Security
89}:
910
1011# TODO: move to carnix or https://github.com/kolloch/crate2nix
@@ -51,6 +52,8 @@ in rustPlatform.buildRustPackage {
5152 pname = "tree-sitter";
5253 inherit src version cargoSha256;
5354
55+ buildInputs = lib.optionals stdenv.isDarwin [ Security ];
56+
5457 nativeBuildInputs = [ emscripten which ];
5558
5659 postPatch = ''
@@ -103,9 +106,8 @@ in rustPlatform.buildRustPackage {
103106 '';
104107 license = lib.licenses.mit;
105108 maintainers = with lib.maintainers; [ Profpatsch ];
106− # Darwin needs some more work with default libraries
107109 # Aarch has test failures with how tree-sitter compiles the generated C files
108− broken = stdenv.isDarwin || stdenv.isAarch64;
110+ broken = stdenv.isAarch64;
109111 };
110112
111113}
pkgs/top-level/all-packages.nix+3−1
@@ -11885,7 +11885,9 @@ in
1188511885
1188611886 travis = callPackage ../development/tools/misc/travis { };
1188711887
11888− tree-sitter = callPackage ../development/tools/parsing/tree-sitter { };
11888+ tree-sitter = callPackage ../development/tools/parsing/tree-sitter {
11889+ inherit (darwin.apple_sdk.frameworks) Security;
11890+ };
1188911891
1189011892 trellis = callPackage ../development/tools/trellis { };
1189111893