@@ -259,55 +259,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
259259 # upstream issue: missing file header
260260 window-numbering = markBroken super.window-numbering;
261261
262− vterm = let
263− emacsSources = pkgs.stdenv.mkDerivation {
264− name = self.emacs.name + "-sources";
265− src = self.emacs.src;
266−
267− dontConfigure = true;
268− dontBuild = true;
269− doCheck = false;
270− fixupPhase = ":";
271−
272− installPhase = ''
273− mkdir -p $out
274− cp -a * $out
275− '';
276−
277− };
278−
279− libvterm = pkgs.libvterm-neovim.overrideAttrs(old: rec {
280− pname = "libvterm-neovim";
281− version = "2019-04-27";
282− name = pname + "-" + version;
283− src = pkgs.fetchFromGitHub {
284− owner = "neovim";
285− repo = "libvterm";
286− rev = "89675ffdda615ffc3f29d1c47a933f4f44183364";
287− sha256 = "0l9ixbj516vl41v78fi302ws655xawl7s94gmx1kb3fmfgamqisy";
288− };
289− });
290−
291− in pkgs.stdenv.mkDerivation rec {
292− inherit (super.vterm) name version src;
293−
294− nativeBuildInputs = [ pkgs.cmake ];
295− buildInputs = [ self.emacs libvterm ];
296−
297− cmakeFlags = [
298− "-DEMACS_SOURCE=${emacsSources}"
299− "-DUSE_SYSTEM_LIBVTERM=True"
300− ];
301−
302− installPhase = ''
303− install -d $out/share/emacs/site-lisp
304− install ../*.el $out/share/emacs/site-lisp
305− install ../*.so $out/share/emacs/site-lisp
306− '';
307− };
308− # Legacy alias
309− emacs-libvterm = shared.vterm;
310−
311262 zmq = super.zmq.overrideAttrs(old: {
312263 stripDebugList = [ "share" ];
313264 preBuild = ''
@@ -470,6 +421,55 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
470421 (attrs.nativeBuildInputs or []) ++ [ external.git ];
471422 });
472423
424+ vterm = let
425+ emacsSources = pkgs.stdenv.mkDerivation {
426+ name = self.emacs.name + "-sources";
427+ src = self.emacs.src;
428+
429+ dontConfigure = true;
430+ dontBuild = true;
431+ doCheck = false;
432+ fixupPhase = ":";
433+
434+ installPhase = ''
435+ mkdir -p $out
436+ cp -a * $out
437+ '';
438+
439+ };
440+
441+ libvterm = pkgs.libvterm-neovim.overrideAttrs(old: rec {
442+ pname = "libvterm-neovim";
443+ version = "2019-04-27";
444+ name = pname + "-" + version;
445+ src = pkgs.fetchFromGitHub {
446+ owner = "neovim";
447+ repo = "libvterm";
448+ rev = "89675ffdda615ffc3f29d1c47a933f4f44183364";
449+ sha256 = "0l9ixbj516vl41v78fi302ws655xawl7s94gmx1kb3fmfgamqisy";
450+ };
451+ });
452+
453+ in pkgs.stdenv.mkDerivation rec {
454+ inherit (super.vterm) name version src;
455+
456+ nativeBuildInputs = [ pkgs.cmake ];
457+ buildInputs = [ self.emacs libvterm ];
458+
459+ cmakeFlags = [
460+ "-DEMACS_SOURCE=${emacsSources}"
461+ "-DUSE_SYSTEM_LIBVTERM=True"
462+ ];
463+
464+ installPhase = ''
465+ install -d $out/share/emacs/site-lisp
466+ install ../*.el $out/share/emacs/site-lisp
467+ install ../*.so $out/share/emacs/site-lisp
468+ '';
469+ };
470+ # Legacy alias
471+ emacs-libvterm = unstable.vterm;
472+
473473 w3m = super.w3m.override (args: {
474474 melpaBuild = drv: args.melpaBuild (drv // {
475475 prePatch =