diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-26 16:50:22 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-26 16:50:22 +0200 |
| commit | 81039713fad72bcfb6d29e358866344c254096c2 (patch) | |
| tree | 5150eb44e296607c43c5c7ece21249d0e39ff098 /pkgs/applications/editors | |
| parent | 21df05d1ad9ad8b3e8138138f65525d2e6324341 (diff) | |
| parent | 8fbdb40ef0ce39e6605db3dfd223402636de8907 (diff) | |
| download | nixpkgs-81039713fad72bcfb6d29e358866344c254096c2.tar nixpkgs-81039713fad72bcfb6d29e358866344c254096c2.tar.gz nixpkgs-81039713fad72bcfb6d29e358866344c254096c2.tar.bz2 nixpkgs-81039713fad72bcfb6d29e358866344c254096c2.tar.lz nixpkgs-81039713fad72bcfb6d29e358866344c254096c2.tar.xz nixpkgs-81039713fad72bcfb6d29e358866344c254096c2.tar.zst nixpkgs-81039713fad72bcfb6d29e358866344c254096c2.zip | |
Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/neovim/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 0eba31375dc..4665ea8a781 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, gettext, glib, libmsgpack, libtermkey , libtool, libuv, lpeg, lua, luajit, luaMessagePack, luabitop, man, ncurses -, perl, pkgconfig, unibilium, makeWrapper, vimUtils +, perl, pkgconfig, unibilium, makeWrapper, vimUtils, xsel , withPython ? true, pythonPackages, extraPythonPackages ? [] , withPython3 ? true, python3Packages, extraPython3Packages ? [] @@ -111,6 +111,7 @@ let install_name_tool -change libjemalloc.1.dylib \ ${jemalloc}/lib/libjemalloc.1.dylib \ $out/bin/nvim + sed -i -e "s|'xsel|'${xsel}/bin/xsel|" share/nvim/runtime/autoload/provider/clipboard.vim '' + optionalString withPython '' ln -s ${pythonEnv}/bin/python $out/bin/nvim-python '' + optionalString withPyGUI '' |