diff options
author | adisbladis <adisbladis@gmail.com> | 2019-05-01 12:18:51 +0100 |
---|---|---|
committer | adisbladis <adisbladis@gmail.com> | 2019-05-01 12:24:50 +0100 |
commit | b9ed29725baedf8f093cb2742041f567aa2d28ab (patch) | |
tree | 72c3dd84e30e526e06294c4da3f4aba0c82244aa /pkgs/applications/editors/emacs-modes/emacs-libvterm | |
parent | ebbeae56bdce0226ca66414160345ccdf457284b (diff) | |
download | nixpkgs-b9ed29725baedf8f093cb2742041f567aa2d28ab.tar nixpkgs-b9ed29725baedf8f093cb2742041f567aa2d28ab.tar.gz nixpkgs-b9ed29725baedf8f093cb2742041f567aa2d28ab.tar.bz2 nixpkgs-b9ed29725baedf8f093cb2742041f567aa2d28ab.tar.lz nixpkgs-b9ed29725baedf8f093cb2742041f567aa2d28ab.tar.xz nixpkgs-b9ed29725baedf8f093cb2742041f567aa2d28ab.tar.zst nixpkgs-b9ed29725baedf8f093cb2742041f567aa2d28ab.zip |
emacs-libvterm: unstable-2018-11-16 -> unstable-2019-04-28
Diffstat (limited to 'pkgs/applications/editors/emacs-modes/emacs-libvterm')
-rw-r--r-- | pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix index 8d39c185aca..8980dc1f0a9 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix @@ -17,25 +17,41 @@ let }; + libvterm = libvterm-neovim.overrideAttrs(old: rec { + pname = "libvterm-neovim"; + version = "2019-04-27"; + name = pname + "-" + version; + src = fetchFromGitHub { + owner = "neovim"; + repo = "libvterm"; + rev = "89675ffdda615ffc3f29d1c47a933f4f44183364"; + sha256 = "0l9ixbj516vl41v78fi302ws655xawl7s94gmx1kb3fmfgamqisy"; + }; + }); + + in stdenv.mkDerivation rec { name = "emacs-libvterm-${version}"; - version = "unstable-2018-11-16"; + version = "unstable-2019-04-28"; src = fetchFromGitHub { owner = "akermu"; repo = "emacs-libvterm"; - rev = "8be9316156be75a685c0636258b2fec2daaf5ab5"; - sha256 = "059js4aa7xgqcpaicgy4gz683hppa1iyp1r98mnms5hd31a304k8"; + rev = "6adcedf3e4aaadeeaff97437044fba17aeb466d4"; + sha256 = "1j6qr5bmajig3idhwsaa3zm72w13q9zn77z2dlrhhx3p4bbds3f8"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ emacs libvterm-neovim ]; + buildInputs = [ emacs libvterm ]; - cmakeFlags = [ "-DEMACS_SOURCE=${emacsSources}" ]; + cmakeFlags = [ + "-DEMACS_SOURCE=${emacsSources}" + "-DUSE_SYSTEM_LIBVTERM=True" + ]; installPhase = '' install -d $out/share/emacs/site-lisp install ../*.el $out/share/emacs/site-lisp - install ./*.so $out/share/emacs/site-lisp + install ../*.so $out/share/emacs/site-lisp ''; } |