git.iko.soy/helix
on master help sign in
build(nix): add a way to override what grammars get built (#3141)
85a5df0Yusuf Bera Ertan
flake.nix+105−73
compare with master
unifiedsplit
@@ -18,83 +18,115 @@
18 nixpkgs,
18 nixpkgs,
19 nixCargoIntegration,
19 nixCargoIntegration,
20 ...
20 ...
21− }:
21+ }: let
22+ outputs = config:
22− nixCargoIntegration.lib.makeOutputs {
23+ nixCargoIntegration.lib.makeOutputs {
23− root = ./.;
24+ root = ./.;
24− renameOutputs = {"helix-term" = "helix";};
25+ renameOutputs = {"helix-term" = "helix";};
25− # Set default app to hx (binary is from helix-term release build)
26+ # Set default app to hx (binary is from helix-term release build)
26− # Set default package to helix-term release build
27+ # Set default package to helix-term release build
27− defaultOutputs = {
28+ defaultOutputs = {
28− app = "hx";
29+ app = "hx";
29− package = "helix";
30+ package = "helix";
30− };
31+ };
31− overrides = {
32+ overrides = {
32− cCompiler = common:
33+ cCompiler = common:
33− with common.pkgs;
34+ with common.pkgs;
34− if stdenv.isLinux
35+ if stdenv.isLinux
35− then gcc
36+ then gcc
36− else clang;
37+ else clang;
37− crateOverrides = common: _: {
38+ crateOverrides = common: _: {
38− helix-term = prev: let
39+ helix-term = prev: let
39− inherit (common) pkgs;
40+ inherit (common) pkgs;
40− mkRootPath = rel:
41+ mkRootPath = rel:
41− builtins.path {
42+ builtins.path {
42− path = "${common.root}/${rel}";
43+ path = "${common.root}/${rel}";
43− name = rel;
44+ name = rel;
44− };
45+ };
45− grammars = pkgs.callPackage ./grammars.nix {};
46+ grammars = pkgs.callPackage ./grammars.nix config;
46− runtimeDir = pkgs.runCommandNoCC "helix-runtime" {} ''
47+ runtimeDir = pkgs.runCommandNoCC "helix-runtime" {} ''
47− mkdir -p $out
48+ mkdir -p $out
48− ln -s ${mkRootPath "runtime"}/* $out
49+ ln -s ${mkRootPath "runtime"}/* $out
49− rm -r $out/grammars
50+ rm -r $out/grammars
50− ln -s ${grammars} $out/grammars
51+ ln -s ${grammars} $out/grammars
51− '';
52+ '';
52− in {
53+ overridedAttrs = {
53− # disable fetching and building of tree-sitter grammars in the helix-term build.rs
54+ # disable fetching and building of tree-sitter grammars in the helix-term build.rs
54− HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
55+ HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
55− # link languages and theme toml files since helix-term expects them (for tests)
56+ # link languages and theme toml files since helix-term expects them (for tests)
56− preConfigure =
57+ preConfigure =
57− pkgs.lib.concatMapStringsSep
58+ pkgs.lib.concatMapStringsSep
58− "\n"
59+ "\n"
59− (path: "ln -sf ${mkRootPath path} ..")
60+ (path: "ln -sf ${mkRootPath path} ..")
60− ["languages.toml" "theme.toml" "base16_theme.toml"];
61+ ["languages.toml" "theme.toml" "base16_theme.toml"];
61− buildInputs = (prev.buildInputs or []) ++ [common.cCompiler.cc.lib];
62+ buildInputs = (prev.buildInputs or []) ++ [common.cCompiler.cc.lib];
62− nativeBuildInputs = [pkgs.makeWrapper];
63+ nativeBuildInputs = [pkgs.makeWrapper];
63
64
64− postFixup = ''
65+ postFixup = ''
65− if [ -f "$out/bin/hx" ]; then
66+ if [ -f "$out/bin/hx" ]; then
66− wrapProgram "$out/bin/hx" ''${makeWrapperArgs[@]} --set HELIX_RUNTIME "${runtimeDir}"
67+ wrapProgram "$out/bin/hx" ''${makeWrapperArgs[@]} --set HELIX_RUNTIME "${runtimeDir}"
67− fi
68+ fi
68− '';
69+ '';
70+ };
71+ in
72+ overridedAttrs
73+ // (
74+ pkgs.lib.optionalAttrs
75+ (config ? makeWrapperArgs)
76+ {inherit (config) makeWrapperArgs;}
77+ );
78+ };
79+ shell = common: prev: {
80+ packages =
81+ prev.packages
82+ ++ (
83+ with common.pkgs; [lld_13 lldb cargo-tarpaulin cargo-flamegraph rust-analyzer]
84+ );
85+ env =
86+ prev.env
87+ ++ [
88+ {
89+ name = "HELIX_RUNTIME";
90+ eval = "$PWD/runtime";
91+ }
92+ {
93+ name = "RUST_BACKTRACE";
94+ value = "1";
95+ }
96+ {
97+ name = "RUSTFLAGS";
98+ value =
99+ if common.pkgs.stdenv.isLinux
100+ then "-C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment"
101+ else "";
102+ }
103+ ];
69 };
104 };
70 };
105 };
71− shell = common: prev: {
72− packages =
73− prev.packages
74− ++ (
75− with common.pkgs; [lld_13 lldb cargo-tarpaulin cargo-flamegraph rust-analyzer]
76− );
77− env =
78− prev.env
79− ++ [
80− {
81− name = "HELIX_RUNTIME";
82− eval = "$PWD/runtime";
83− }
84− {
85− name = "RUST_BACKTRACE";
86− value = "1";
87− }
88− {
89− name = "RUSTFLAGS";
90− value =
91− if common.pkgs.stdenv.isLinux
92− then "-C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment"
93− else "";
94− }
95− ];
96− };
97 };
106 };
107+ defaultOutputs = outputs {};
108+ makeOverridableHelix = system: old:
109+ old
110+ // {
111+ override = args:
112+ makeOverridableHelix
113+ system
114+ (outputs args).packages.${system}.helix;
115+ };
116+ in
117+ defaultOutputs
118+ // {
119+ packages =
120+ nixpkgs.lib.mapAttrs
121+ (
122+ system: packages:
123+ packages
124+ // rec {
125+ default = helix;
126+ helix = makeOverridableHelix system packages.helix;
127+ }
128+ )
129+ defaultOutputs.packages;
98 };
130 };
99
131
100 nixConfig = {
132 nixConfig = {
grammars.nix+4−1
@@ -4,6 +4,8 @@
4 runCommandLocal,
4 runCommandLocal,
5 runCommandNoCC,
5 runCommandNoCC,
6 yj,
6 yj,
7+ includeGrammarIf ? _: true,
8+ ...
7}: let
9}: let
8 # HACK: nix < 2.6 has a bug in the toml parser, so we convert to JSON
10 # HACK: nix < 2.6 has a bug in the toml parser, so we convert to JSON
9 # before parsing
11 # before parsing
@@ -102,12 +104,13 @@
102 runHook postFixup
104 runHook postFixup
103 '';
105 '';
104 };
106 };
107+ grammarsToBuild = builtins.filter includeGrammarIf gitGrammars;
105 builtGrammars =
108 builtGrammars =
106 builtins.map (grammar: {
109 builtins.map (grammar: {
107 inherit (grammar) name;
110 inherit (grammar) name;
108 artifact = buildGrammar grammar;
111 artifact = buildGrammar grammar;
109 })
112 })
110− gitGrammars;
113+ grammarsToBuild;
111 grammarLinks =
114 grammarLinks =
112 builtins.map (grammar: "ln -s ${grammar.artifact}/${grammar.name}.so $out/${grammar.name}.so")
115 builtins.map (grammar: "ln -s ${grammar.artifact}/${grammar.name}.so $out/${grammar.name}.so")
113 builtGrammars;
116 builtGrammars;