diff options
| author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-06-17 19:36:06 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-06-17 22:21:32 +0200 |
| commit | 98b2d7b727491f18e2f3e0bba17611e95e6e8016 (patch) | |
| tree | 9da18a1f37a9781e15d8ed1d0a56b7e598906d4a /pkgs/applications/editors | |
| parent | d4fc2b4d99122ba6592835aa84f659b22aeea433 (diff) | |
| download | nixlib-98b2d7b727491f18e2f3e0bba17611e95e6e8016.tar nixlib-98b2d7b727491f18e2f3e0bba17611e95e6e8016.tar.gz nixlib-98b2d7b727491f18e2f3e0bba17611e95e6e8016.tar.bz2 nixlib-98b2d7b727491f18e2f3e0bba17611e95e6e8016.tar.lz nixlib-98b2d7b727491f18e2f3e0bba17611e95e6e8016.tar.xz nixlib-98b2d7b727491f18e2f3e0bba17611e95e6e8016.tar.zst nixlib-98b2d7b727491f18e2f3e0bba17611e95e6e8016.zip | |
Separate nativeBuildInputs where maintainers |= nckx
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/neovim/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 3943a9910a4d..28d455e06b26 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -27,7 +27,8 @@ let owner = "neovim"; }; - buildInputs = [ libtool perl ]; + buildInputs = [ perl ]; + nativeBuildInputs = [ libtool ]; makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; @@ -66,8 +67,6 @@ let enableParallelBuilding = true; buildInputs = [ - makeWrapper - cmake glib libtermkey libuv @@ -79,12 +78,14 @@ let libmsgpack ncurses neovimLibvterm - pkgconfig unibilium ] ++ optional withJemalloc jemalloc; nativeBuildInputs = [ + cmake gettext + makeWrapper + pkgconfig ]; LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;${luabitop}/lib/lua/5.2/?.so"; @@ -136,7 +137,7 @@ let in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation rec { name = "neovim-${version}-configured"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildCommand = '' mkdir -p $out/bin for item in ${neovim}/bin/*; do |