diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-23 09:02:10 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-23 09:02:10 +0200 |
| commit | 0b192a09767c05b38f3e2838c07e9600318bbbb5 (patch) | |
| tree | 4467053c39ef4bad71527cd5fda5cf92960575e8 /pkgs/applications/editors | |
| parent | dc5bbc4700dd95420f87141efcc0e6cb48a710f9 (diff) | |
| parent | 0e54c749114b79f6be78486086f5829b176fcba8 (diff) | |
| download | nixpkgs-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar nixpkgs-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.gz nixpkgs-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.bz2 nixpkgs-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.lz nixpkgs-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.xz nixpkgs-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.zst nixpkgs-0b192a09767c05b38f3e2838c07e9600318bbbb5.zip | |
Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/neovim/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 5ac7a69aeda..0eba31375dc 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, ncurses, perl -, pkgconfig, unibilium, makeWrapper, vimUtils +, libtool, libuv, lpeg, lua, luajit, luaMessagePack, luabitop, man, ncurses +, perl, pkgconfig, unibilium, makeWrapper, vimUtils , withPython ? true, pythonPackages, extraPythonPackages ? [] , withPython3 ? true, python3Packages, extraPython3Packages ? [] @@ -98,7 +98,10 @@ let LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so"; LUA_PATH="${luaMessagePack}/share/lua/5.1/?.lua"; - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + preConfigure = '' + substituteInPlace runtime/autoload/man.vim \ + --replace /usr/bin/man ${man}/bin/man + '' + stdenv.lib.optionalString stdenv.isDarwin '' export DYLD_LIBRARY_PATH=${jemalloc}/lib substituteInPlace src/nvim/CMakeLists.txt --replace " util" "" ''; |