diff options
| author | Nick Hu <me@nickhu.co.uk> | 2020-11-12 09:05:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-12 09:05:59 +0000 |
| commit | a371c1071161104d329f6a85d922fd92b7cbab63 (patch) | |
| tree | 1136afb3485b6ce0b8d011300895780036818b61 /pkgs/top-level | |
| parent | a0ea78c7068d4f9e72e59a499879da2b7bbe8a02 (diff) | |
| parent | 4d8adccab694baf4d413e8feef308c9b1da2d507 (diff) | |
Merge pull request #102763 from colemickens/tree-sitter
tree-sitter: 0.17.1 -> 0.17.3; run make install
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/static.nix | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 394e60bb3953..551b285d419a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11960,7 +11960,9 @@ in travis = callPackage ../development/tools/misc/travis { }; - tree-sitter = callPackage ../development/tools/parsing/tree-sitter { }; + tree-sitter = callPackage ../development/tools/parsing/tree-sitter { + inherit (darwin.apple_sdk.frameworks) Security; + }; trellis = callPackage ../development/tools/trellis { }; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 865e5cf2900e..b3851ba20f09 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -286,6 +286,11 @@ in { libexecinfo = super.libexecinfo.override { enableShared = false; }; + tree-sitter = super.tree-sitter.override { + enableShared = false; + enableStatic = true; + }; + xorg = super.xorg.overrideScope' (xorgself: xorgsuper: { libX11 = xorgsuper.libX11.overrideAttrs (attrs: { depsBuildBuild = attrs.depsBuildBuild ++ [ (self.buildPackages.stdenv.cc.libc.static or null) ]; |