public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tree-sitter: make shared/static libraries configurable

Browse Source
This commit is contained in:
Nick Hu 2020-11-09 18:41:20 +00:00
parent 562eaafd36
commit aea7f1b540
No known key found for this signature in database
GPG Key ID: 9E35DDA3DF631330
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/tools/parsing/tree-sitter/default.nix
View File

@ -3,6 +3,8 @@
, writeShellScript, runCommand, which , writeShellScript, runCommand, which
, rustPlatform, jq, nix-prefetch-git, xe, curl, emscripten , rustPlatform, jq, nix-prefetch-git, xe, curl, emscripten
, callPackage , callPackage
, enableShared ? true
, enableStatic ? false
}: }:
# TODO: move to carnix or https://github.com/kolloch/crate2nix # TODO: move to carnix or https://github.com/kolloch/crate2nix
@ -69,8 +71,9 @@ in rustPlatform.buildRustPackage {
''; '';
postInstall = '' postInstall = ''
export PREFIX=$out PREFIX=$out make install
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 # test result: FAILED. 120 passed; 13 failed; 0 ignored; 0 measured; 0 filtered out

5
pkgs/top-level/static.nix
View File

@ -286,6 +286,11 @@ in {
libexecinfo = super.libexecinfo.override { enableShared = false; }; libexecinfo = super.libexecinfo.override { enableShared = false; };
tree-sitter = super.tree-sitter.override {
enableShared = false;
enableStatic = true;
};
xorg = super.xorg.overrideScope' (xorgself: xorgsuper: { xorg = super.xorg.overrideScope' (xorgself: xorgsuper: {
libX11 = xorgsuper.libX11.overrideAttrs (attrs: { libX11 = xorgsuper.libX11.overrideAttrs (attrs: {
depsBuildBuild = attrs.depsBuildBuild ++ [ (self.buildPackages.stdenv.cc.libc.static or null) ]; depsBuildBuild = attrs.depsBuildBuild ++ [ (self.buildPackages.stdenv.cc.libc.static or null) ];