Merge pull request #40583 from adisbladis/emacsPackages.emacs-libvterm

emacsPackages.emacs-libvterm: init at unstable-2017-11-24

pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix

@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, cmake, emacs, neovim-libvterm }:
+
+let
+  emacsSources = stdenv.mkDerivation {
+    name = emacs.name + "-sources";
+    src = emacs.src;
+
+    configurePhase = ":";
+    dontBuild = true;
+    doCheck = false;
+    fixupPhase = ":";
+
+    installPhase = ''
+      mkdir -p $out
+      cp -a * $out
+    '';
+
+  };
+
+in stdenv.mkDerivation rec {
+  name = "emacs-libvterm-${version}";
+  version = "unstable-2017-11-24";
+
+  src = fetchFromGitHub {
+    owner = "akermu";
+    repo = "emacs-libvterm";
+    rev = "829ae86f60c3a54048804997edffa161c77a2f4b";
+    sha256 = "1xb24kpvypvskh4vr3b45nl2m2vsczcr9rnsr2sjzf32mnapyjnp";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ emacs neovim-libvterm ];
+
+  cmakeFlags = [ "-DEMACS_SOURCE=${emacsSources}" ];
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install ../*.el $out/share/emacs/site-lisp
+    install ../*.so $out/share/emacs/site-lisp
+  '';
+}

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

pkgs/development/libraries/libvterm-neovim/default.nix

@@ -0,0 +1,33 @@
+{ stdenv
+, fetchFromGitHub
+, perl
+, libtool
+}:
+
+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 = with stdenv.lib; {
+    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;
+  };
+}

pkgs/top-level/all-packages.nix

@@ -10532,6 +10532,7 @@ with pkgs;
   libvpx-git = callPackage ../development/libraries/libvpx/git.nix { };
 
   libvterm = callPackage ../development/libraries/libvterm { };
+  libvterm-neovim = callPackage ../development/libraries/libvterm-neovim { };
 
   libvorbis = callPackage ../development/libraries/libvorbis { };
 

pkgs/top-level/emacs-packages.nix

@@ -178,6 +178,8 @@ let
     };
   };
 
+  emacs-libvterm = callPackage ../applications/editors/emacs-modes/emacs-libvterm { };
+
   evil-jumper = melpaBuild rec {
     pname   = "evil-jumper";
     version = "20151017";