diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix index 63082f60ac2c..e34350615636 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -3,6 +3,9 @@ , writeShellScript, runCommand, which , rustPlatform, jq, nix-prefetch-git, xe, curl, emscripten , callPackage +, enableShared ? true +, enableStatic ? false +, Security }: # TODO: move to carnix or https://github.com/kolloch/crate2nix @@ -11,9 +14,9 @@ let # 1) change all these hashes # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) run the ./result script that is output by that (it updates ./grammars) - version = "0.17.1"; - sha256 = "sha256-k61actAEyao/Ea8aw9PCm252U+1I0d43MAYC68/lui4="; - cargoSha256 = "sha256-Jp/Fl20ZZfaIdWinOOujNVH5JjJNtyUYHfyTrmeeoRg="; + version = "0.17.3"; + sha256 = "sha256-uQs80r9cPX8Q46irJYv2FfvuppwonSS5HVClFujaP+U="; + cargoSha256 = "sha256-fonlxLNh9KyEwCj7G5vxa7cM/DlcHNFbQpp0SwVQ3j4="; src = fetchFromGitHub { owner = "tree-sitter"; @@ -49,6 +52,8 @@ in rustPlatform.buildRustPackage { pname = "tree-sitter"; inherit src version cargoSha256; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + nativeBuildInputs = [ emscripten which ]; postPatch = '' @@ -68,6 +73,12 @@ in rustPlatform.buildRustPackage { bash ./script/build-wasm --debug ''; + postInstall = '' + PREFIX=$out make install + ${lib.optionalString (!enableShared) "rm $out/lib/*.so{,.*}"} + ${lib.optionalString (!enableStatic) "rm $out/lib/*.a"} + ''; + # test result: FAILED. 120 passed; 13 failed; 0 ignored; 0 measured; 0 filtered out doCheck = false; @@ -95,9 +106,8 @@ in rustPlatform.buildRustPackage { ''; license = lib.licenses.mit; maintainers = with lib.maintainers; [ Profpatsch ]; - # Darwin needs some more work with default libraries # Aarch has test failures with how tree-sitter compiles the generated C files - broken = stdenv.isDarwin || stdenv.isAarch64; + broken = stdenv.isAarch64; }; } |