Commit 91943aaa authored by linsui's avatar linsui
Browse files

vimPlugins.orgmode: fix tree-sitter-org error

parent d325772e

pkgs/applications/editors/vim/plugins/overrides.nix

+0 −4
Original line number Diff line number Diff line
@@ -2631,10 +2631,6 @@ in 
    ];

  };



  orgmode = super.orgmode.overrideAttrs {

    dependencies = with self; [ (nvim-treesitter.withPlugins (p: [ p.org ])) ];

  };



  otter-nvim = super.otter-nvim.overrideAttrs {

    dependencies = [ self.nvim-lspconfig ];

  };

pkgs/development/lua-modules/overrides.nix

+3 −5
Original line number Diff line number Diff line
@@ -1114,15 +1114,13 @@ in 
  orgmode = prev.orgmode.overrideAttrs (oa: {

    # Patch in tree-sitter-orgmode dependency

    postPatch = ''

      substituteInPlace lua/orgmode/utils/treesitter/install.lua \

      substituteInPlace lua/orgmode/utils/treesitter/install.lua lua/orgmode/health.lua \

        --replace-fail \

          "pcall(vim.treesitter.language.add, 'org')" \

          "pcall(function() vim.treesitter.language.add('org', { path = '${final.tree-sitter-orgmode}/lib/lua/${final.tree-sitter-orgmode.lua.luaversion}/parser/org.so'}) end)"



      substituteInPlace lua/orgmode/health.lua \

        --replace-fail \

          "pcall(vim.treesitter.language.add, 'org')" \

          "pcall(function() vim.treesitter.language.add('org', { path = '${final.tree-sitter-orgmode}/lib/lua/${final.tree-sitter-orgmode.lua.luaversion}/parser/org.so'}) end)"

      substituteInPlace lua/orgmode/utils/treesitter/install.lua \

        --replace-fail "if M.outdated() then" "if false then"

    '';

  });