Skip to content

Commit

Permalink
vimPlugins: introduce passthru.initLua for some plugins
Browse files Browse the repository at this point in the history
as described in NixOS#172538, some vim
plugins need some configuration to be able to work at all.
We choose not to patch those plugins and instead expose the necessary
configuration to make them work in `PLUGIN.passthru.initLua`.
For now the user can check if plugins have a `PLUGIN.passthru.initLua`
and if yes, prepend it to their own init.lua.

Maybe later we can revisit this to either patch them in a way that is
clear that it's a nixpkgs patch or by having the neovim wrapper pick
those snippets and autoadd them to init.lua ?
  • Loading branch information
teto committed Oct 8, 2024
1 parent 9fc415d commit 468c45b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
7 changes: 7 additions & 0 deletions pkgs/by-name/me/meli/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
, rustPlatform

# native build inputs
, autoPatchelfHook
, pkg-config
, installShellFiles
, makeWrapper
, mandoc
, notmuch
, rustfmt
, file

Expand Down Expand Up @@ -50,6 +52,7 @@ rustPlatform.buildRustPackage rec {
OPENSSL_NO_VENDOR=1;

nativeBuildInputs = [
autoPatchelfHook
pkg-config
installShellFiles
makeWrapper
Expand All @@ -58,11 +61,13 @@ rustPlatform.buildRustPackage rec {
];

buildInputs = [
notmuch
openssl
dbus
sqlite
];


# for exec
nativeCheckInputs = [
file
Expand All @@ -86,6 +91,8 @@ rustPlatform.buildRustPackage rec {
gnum4
];

doCheck = false;

checkFlags = [
"--skip=conf::tests::test_config_parse" # panicking due to sandbox
"--skip=utils::tests::test_shellexpandtrait_impls" # panicking due to sandbox
Expand Down
4 changes: 0 additions & 4 deletions pkgs/by-name/sw/sway/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,9 @@ in symlinkJoin rec {
postBuild = ''
${optionalString withGtkWrapper "gappsWrapperArgsHook"}
ls -l $out/bin
wrapProgram $out/bin/${sway.meta.mainProgram} \
${optionalString withGtkWrapper ''"''${gappsWrapperArgs[@]}"''} \
${optionalString (extraOptions != []) "${concatMapStrings (x: " --add-flags " + x) extraOptions}"}
ls -l $out/bin
'';

passthru = {
Expand Down

0 comments on commit 468c45b

Please sign in to comment.