diff options
| author | adisbladis <adis@blad.is> | 2018-05-16 13:55:26 +0800 |
|---|---|---|
| committer | adisbladis <adis@blad.is> | 2018-05-16 14:02:48 +0800 |
| commit | 3290800d6745e44fe42a6b518c45956c35302276 (patch) | |
| tree | 1daa9d3bdadee8edd1f59dfbc84341c55592b9b4 /pkgs/applications/editors/neovim | |
| parent | b19c92be90df81ba6c030ca2df1ec22f586208de (diff) | |
| download | nixlib-3290800d6745e44fe42a6b518c45956c35302276.tar nixlib-3290800d6745e44fe42a6b518c45956c35302276.tar.gz nixlib-3290800d6745e44fe42a6b518c45956c35302276.tar.bz2 nixlib-3290800d6745e44fe42a6b518c45956c35302276.tar.lz nixlib-3290800d6745e44fe42a6b518c45956c35302276.tar.xz nixlib-3290800d6745e44fe42a6b518c45956c35302276.tar.zst nixlib-3290800d6745e44fe42a6b518c45956c35302276.zip | |
libvterm-neovim: init at 2017-11-05
Diffstat (limited to 'pkgs/applications/editors/neovim')
| -rw-r--r-- | pkgs/applications/editors/neovim/default.nix | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 480b749d201c..b090b0c84f96 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey , libtool, libuv, luaPackages, ncurses, perl, pkgconfig , unibilium, vimUtils, xsel, gperf, callPackage +, libvterm-neovim , withJemalloc ? true, jemalloc }: @@ -8,35 +9,6 @@ with stdenv.lib; let - # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness: - neovimLibvterm = stdenv.mkDerivation rec { - name = "neovim-libvterm-${version}"; - version = "2017-11-05"; - - src = fetchFromGitHub { - owner = "neovim"; - repo = "libvterm"; - rev = "4ca7ebf7d25856e90bc9d9cc49412e80be7c4ea8"; - sha256 = "05kyvvz8af90mvig11ya5xd8f4mbvapwyclyrihm9lwas706lzf6"; - }; - - buildInputs = [ perl ]; - nativeBuildInputs = [ libtool ]; - - makeFlags = [ "PREFIX=$(out)" ] - ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool"; - - enableParallelBuilding = true; - - meta = { - description = "VT220/xterm/ECMA-48 terminal emulator library"; - homepage = http://www.leonerd.org.uk/code/libvterm/; - license = licenses.mit; - maintainers = with maintainers; [ garbas ]; - platforms = platforms.unix; - }; - }; - neovim = stdenv.mkDerivation rec { name = "neovim-unwrapped-${version}"; version = "0.2.2"; @@ -55,7 +27,7 @@ let libuv libmsgpack ncurses - neovimLibvterm + libvterm-neovim unibilium luaPackages.lua gperf |