colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

neovim: wrap in such a way as to avoid cross-compilation-specific patching

Browse Source
This commit is contained in:
Colin
2024-05-13 17:05:14 +00:00
parent 3d2babf2bb
commit 14202a5bcc
2 changed files with 55 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
hosts/common/programs/neovim.nix
View File

@@ -103,8 +103,8 @@ in
# "use" # "use"
]; ];
# packageUnwrapped = config.programs.neovim.finalPackage; packageUnwrapped = let
packageUnwrapped = pkgs.wrapNeovimUnstable pkgs.neovim-unwrapped (pkgs.neovimUtils.makeNeovimConfig { configArgs = {
withRuby = false; #< doesn't cross-compile w/o binfmt withRuby = false; #< doesn't cross-compile w/o binfmt
viAlias = true; viAlias = true;
vimAlias = true; vimAlias = true;
@@ -150,7 +150,14 @@ in
${plugin-config-lua} ${plugin-config-lua}
EOF EOF
''; '';
}); };
in pkgs.wrapNeovimUnstable
pkgs.neovim-unwrapped
# XXX(2024/05/13): manifestRc must be null for cross-compilation to work.
# wrapper invokes `neovim` with all plugins enabled at build time i guess to generate caches and stuff?
# alternative is to emulate `nvim-wrapper` during build.
((pkgs.neovimUtils.makeNeovimConfig configArgs) // { manifestRc = null; })
;
# private because there could be sensitive things in the swap # private because there could be sensitive things in the swap
persist.byStore.private = [ ".cache/vim-swap" ]; persist.byStore.private = [ ".cache/vim-swap" ];

18
overlays/cross.nix
View File

@@ -2094,15 +2094,15 @@ in with final; {
# }; # };
# fixes `hostPrograms.moby.neovim` (but breaks eval of `hostPkgs.moby.neovim` :o) # fixes `hostPrograms.moby.neovim` (but breaks eval of `hostPkgs.moby.neovim` :o)
wrapNeovimUnstable = neovim: config: (prev.wrapNeovimUnstable neovim config).overrideAttrs (upstream: { # wrapNeovimUnstable = neovim: config: (prev.wrapNeovimUnstable neovim config).overrideAttrs (upstream: {
# nvim wrapper has a sanity check that the plugins will load correctly. # # nvim wrapper has a sanity check that the plugins will load correctly.
# this is effectively a check phase and should be rewritten as such # # this is effectively a check phase and should be rewritten as such
postBuild = lib.replaceStrings # postBuild = lib.replaceStrings
[ "! $out/bin/nvim-wrapper" ] # [ "! $out/bin/nvim-wrapper" ]
# [ "${stdenv.hostPlatform.emulator buildPackages} $out/bin/nvim-wrapper" ] # # [ "${stdenv.hostPlatform.emulator buildPackages} $out/bin/nvim-wrapper" ]
[ "false && $out/bin/nvim-wrapper" ] # [ "false && $out/bin/nvim-wrapper" ]
upstream.postBuild; # upstream.postBuild;
}); # });
# 2023/07/30: upstreaming is blocked on unar (gnustep), unless i also make that optional # 2023/07/30: upstreaming is blocked on unar (gnustep), unless i also make that optional
xarchiver = mvToNativeInputs [ libxslt ] prev.xarchiver; xarchiver = mvToNativeInputs [ libxslt ] prev.xarchiver;