neovim: fix the xsel path in the clipboard runtime provider #43995

kalbasit · 2018-07-23T04:36:44Z

Motivation for this change

Currently the share/nvim/runtime/autoload/provider/clipboard.vim file has the following content:

  elseif exists('$DISPLAY') && executable('/nix/store/rl7q8rr97aasvx0bq3aimd50pf0nf4bk-xsel-unstable-2016-09-02/bin/xsel') && s:cmd_ok('xsel -o -b')
    let s:copy['+'] = '/nix/store/rl7q8rr97aasvx0bq3aimd50pf0nf4bk-xsel-unstable-2016-09-02/bin/xsel --nodetach -i -b'
    let s:paste['+'] = '/nix/store/rl7q8rr97aasvx0bq3aimd50pf0nf4bk-xsel-unstable-2016-09-02/bin/xsel -o -b'
    let s:copy['*'] = '/nix/store/rl7q8rr97aasvx0bq3aimd50pf0nf4bk-xsel-unstable-2016-09-02/bin/xsel --nodetach -i -p'
    let s:paste['*'] = '/nix/store/rl7q8rr97aasvx0bq3aimd50pf0nf4bk-xsel-unstable-2016-09-02/bin/xsel -o -p'
    return '/nix/store/rl7q8rr97aasvx0bq3aimd50pf0nf4bk-xsel-unstable-2016-09-02/bin/xsel'

as you can see, the s:cmd_ok('xsel -o -b') never evaluates to true and the X11 clipboard does not work. This PR changes the sed command to replace all occurrences of 'xsel so the command works. Here's the same snippet after the build:

  elseif exists('$DISPLAY') && executable('/nix/store/rl7q8rr97aasvx0bq3aimd50pf0nf4bk-xsel-unstable-2016-09-02/bin/xsel') && s:cmd_ok('/nix/store/rl7q8rr97aasvx0bq3aimd50pf0nf4bk-xsel-unstable-2016-09-02/bin/xsel -o -b')
    let s:copy['+'] = '/nix/store/rl7q8rr97aasvx0bq3aimd50pf0nf4bk-xsel-unstable-2016-09-02/bin/xsel --nodetach -i -b'
    let s:paste['+'] = '/nix/store/rl7q8rr97aasvx0bq3aimd50pf0nf4bk-xsel-unstable-2016-09-02/bin/xsel -o -b'
    let s:copy['*'] = '/nix/store/rl7q8rr97aasvx0bq3aimd50pf0nf4bk-xsel-unstable-2016-09-02/bin/xsel --nodetach -i -p'
    let s:paste['*'] = '/nix/store/rl7q8rr97aasvx0bq3aimd50pf0nf4bk-xsel-unstable-2016-09-02/bin/xsel -o -p'
    return '/nix/store/rl7q8rr97aasvx0bq3aimd50pf0nf4bk-xsel-unstable-2016-09-02/bin/xsel'

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
Built on platform(s)
- NixOS
- macOS
- other Linux distributions
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Determined the impact on package closure size (by running nix path-info -S before and after)
Fits CONTRIBUTING.md.

closes kalbasit/shabka#17

Mic92 · 2018-07-23T09:52:46Z

Is a backport required here?

kalbasit · 2018-07-23T15:34:41Z

@Mic92 probably since it’s a bug fix only.

Mic92 · 2018-07-23T20:42:00Z

git backport 5c7c2be
[detached HEAD 3cf0621] neovim: fix the xsel path in the clipboard runtime provider
Author: Wael M. Nasreddine wael.nasreddine@gmail.com
Date: Sun Jul 22 21:32:16 2018 -0700
1 file changed, 1 insertion(+), 1 deletion(-)

neovim: fix the xsel path in the clipboard runtime provider

5c7c2be

GrahamcOfBorg added 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 labels Jul 23, 2018

FRidh requested a review from garbas July 23, 2018 04:49

Mic92 merged commit 102eb1f into NixOS:master Jul 23, 2018

kalbasit deleted the fix-neovim-unwrapped branch July 23, 2018 15:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

neovim: fix the xsel path in the clipboard runtime provider #43995

neovim: fix the xsel path in the clipboard runtime provider #43995

kalbasit commented Jul 23, 2018 •

edited

Mic92 commented Jul 23, 2018

kalbasit commented Jul 23, 2018

Mic92 commented Jul 23, 2018 •

edited

neovim: fix the xsel path in the clipboard runtime provider #43995

neovim: fix the xsel path in the clipboard runtime provider #43995

Conversation

kalbasit commented Jul 23, 2018 • edited

Motivation for this change

Things done

Mic92 commented Jul 23, 2018

kalbasit commented Jul 23, 2018

Mic92 commented Jul 23, 2018 • edited

kalbasit commented Jul 23, 2018 •

edited

Mic92 commented Jul 23, 2018 •

edited