Loading pkgs/applications/editors/vim/plugins/generated.nix +370 −370 File changed.Preview size limit exceeded, changes collapsed. Show changes pkgs/applications/editors/vim/plugins/overrides.nix +4 −2 Original line number Diff line number Diff line Loading @@ -328,6 +328,10 @@ assertNoAdditions { dependencies = [ self.plenary-nvim ]; }; blink-cmp-latex = super.blink-cmp-latex.overrideAttrs { dependencies = [ self.blink-cmp ]; }; blink-cmp-nixpkgs-maintainers = super.blink-cmp-nixpkgs-maintainers.overrideAttrs { dependencies = [ self.blink-cmp ]; }; Loading Loading @@ -2973,7 +2977,6 @@ assertNoAdditions { openscad-nvim = super.openscad-nvim.overrideAttrs { buildInputs = [ zathura htop openscad ]; Loading @@ -2985,7 +2988,6 @@ assertNoAdditions { ]; patches = [ (replaceVars ./patches/openscad.nvim/program_paths.patch { htop = lib.getExe htop; openscad = lib.getExe openscad; }) ]; Loading pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch +5 −23 Original line number Diff line number Diff line diff --git a/autoload/health/openscad_nvim.vim b/autoload/health/openscad_nvim.vim index d6d4b4c..9853877 100644 --- a/autoload/health/openscad_nvim.vim +++ b/autoload/health/openscad_nvim.vim @@ -15,7 +15,7 @@ function! s:check_zathura_installed() abort endfunction function! s:check_htop_installed() abort - if !executable('htop') + if !executable('@htop@') call v:lua.vim.health.error('has(htop)','install htop') else call v:lua.vim.health.ok("htop is installed") diff --git a/lua/openscad.lua b/lua/openscad.lua index 0a26d08..1264989 100644 index f889463..dde5b97 100644 --- a/lua/openscad.lua +++ b/lua/openscad.lua @@ -126,7 +126,7 @@ function M.exec_openscad() jobCommand = '/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD ' .. filename else -- TODO: What about Windows? - jobCommand = 'openscad ' .. filename + jobCommand = '@openscad@ ' .. filename end vim.fn.jobstart(jobCommand) @@ -147 +147 @@ function M.exec_openscad() - or 'openscad' + or '@openscad@' -- Loading
pkgs/applications/editors/vim/plugins/generated.nix +370 −370 File changed.Preview size limit exceeded, changes collapsed. Show changes
pkgs/applications/editors/vim/plugins/overrides.nix +4 −2 Original line number Diff line number Diff line Loading @@ -328,6 +328,10 @@ assertNoAdditions { dependencies = [ self.plenary-nvim ]; }; blink-cmp-latex = super.blink-cmp-latex.overrideAttrs { dependencies = [ self.blink-cmp ]; }; blink-cmp-nixpkgs-maintainers = super.blink-cmp-nixpkgs-maintainers.overrideAttrs { dependencies = [ self.blink-cmp ]; }; Loading Loading @@ -2973,7 +2977,6 @@ assertNoAdditions { openscad-nvim = super.openscad-nvim.overrideAttrs { buildInputs = [ zathura htop openscad ]; Loading @@ -2985,7 +2988,6 @@ assertNoAdditions { ]; patches = [ (replaceVars ./patches/openscad.nvim/program_paths.patch { htop = lib.getExe htop; openscad = lib.getExe openscad; }) ]; Loading
pkgs/applications/editors/vim/plugins/patches/openscad.nvim/program_paths.patch +5 −23 Original line number Diff line number Diff line diff --git a/autoload/health/openscad_nvim.vim b/autoload/health/openscad_nvim.vim index d6d4b4c..9853877 100644 --- a/autoload/health/openscad_nvim.vim +++ b/autoload/health/openscad_nvim.vim @@ -15,7 +15,7 @@ function! s:check_zathura_installed() abort endfunction function! s:check_htop_installed() abort - if !executable('htop') + if !executable('@htop@') call v:lua.vim.health.error('has(htop)','install htop') else call v:lua.vim.health.ok("htop is installed") diff --git a/lua/openscad.lua b/lua/openscad.lua index 0a26d08..1264989 100644 index f889463..dde5b97 100644 --- a/lua/openscad.lua +++ b/lua/openscad.lua @@ -126,7 +126,7 @@ function M.exec_openscad() jobCommand = '/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD ' .. filename else -- TODO: What about Windows? - jobCommand = 'openscad ' .. filename + jobCommand = '@openscad@ ' .. filename end vim.fn.jobstart(jobCommand) @@ -147 +147 @@ function M.exec_openscad() - or 'openscad' + or '@openscad@' --