emacs-packages: Drop emacs-libvterm package

Use auto-generated melpa package

2 files changed, 49 insertions, 57 deletions

diff --git a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
deleted file mode 100644
index ba54b9404a0cc..0000000000000
--- a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, emacs, libvterm-neovim }:
-
-let
-  emacsSources = stdenv.mkDerivation {
-    name = emacs.name + "-sources";
-    src = emacs.src;
-
-    dontConfigure = true;
-    dontBuild = true;
-    doCheck = false;
-    fixupPhase = ":";
-
-    installPhase = ''
-      mkdir -p $out
-      cp -a * $out
-    '';
-
-  };
-
-  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-2019-07-22";
-
-  src = fetchFromGitHub {
-    owner = "akermu";
-    repo = "emacs-libvterm";
-    rev = "301fe9fdfd5fb2496c8428a11e0812fd8a4c0820";
-    sha256 = "0i1hn5gcxayqcbjrnpgczvbicq2vsyn59646ary3crs0mz9wlbpr";
-  };
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ emacs libvterm ];
-
-  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
-  '';
-}
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index f8ef53e6d2119..43086bbd1e68e 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -183,6 +183,55 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
         # upstream issue: missing file header
         window-numbering = markBroken super.window-numbering;
 
+        vterm = let
+          emacsSources = pkgs.stdenv.mkDerivation {
+            name = self.emacs.name + "-sources";
+            src = self.emacs.src;
+
+            dontConfigure = true;
+            dontBuild = true;
+            doCheck = false;
+            fixupPhase = ":";
+
+            installPhase = ''
+              mkdir -p $out
+              cp -a * $out
+            '';
+
+          };
+
+          libvterm = pkgs.libvterm-neovim.overrideAttrs(old: rec {
+            pname = "libvterm-neovim";
+            version = "2019-04-27";
+            name = pname + "-" + version;
+            src = pkgs.fetchFromGitHub {
+              owner = "neovim";
+              repo = "libvterm";
+              rev = "89675ffdda615ffc3f29d1c47a933f4f44183364";
+              sha256 = "0l9ixbj516vl41v78fi302ws655xawl7s94gmx1kb3fmfgamqisy";
+            };
+          });
+
+        in pkgs.stdenv.mkDerivation rec {
+          inherit (super.vterm) name version src;
+
+          nativeBuildInputs = [ pkgs.cmake ];
+          buildInputs = [ self.emacs libvterm ];
+
+          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
+          '';
+        };
+        # Legacy alias
+        emacs-libvterm = shared.vterm;
+
         zmq = super.zmq.overrideAttrs(old: {
           stripDebugList = [ "share" ];
           preBuild = ''