@@ -394,52 +394,22 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
394394 (attrs.nativeBuildInputs or []) ++ [ external.git ];
395395 });
396396
397− vterm = let
398− emacsSources = pkgs.stdenv.mkDerivation {
399− name = self.emacs.name + "-sources";
400− src = self.emacs.src;
401−
402− dontConfigure = true;
403− dontBuild = true;
404− doCheck = false;
405− fixupPhase = ":";
406−
407− installPhase = ''
408− mkdir -p $out
409− cp -a * $out
410− '';
411−
412− };
413−
414− libvterm = pkgs.libvterm-neovim.overrideAttrs(old: rec {
415− pname = "libvterm-neovim";
416− version = "2019-04-27";
417− name = pname + "-" + version;
418− src = pkgs.fetchFromGitHub {
419− owner = "neovim";
420− repo = "libvterm";
421− rev = "89675ffdda615ffc3f29d1c47a933f4f44183364";
422− sha256 = "0l9ixbj516vl41v78fi302ws655xawl7s94gmx1kb3fmfgamqisy";
423− };
424− });
425−
426− in pkgs.stdenv.mkDerivation {
427− inherit (super.vterm) name version src;
428−
429− nativeBuildInputs = [ pkgs.cmake ];
430− buildInputs = [ self.emacs libvterm ];
431−
397+ vterm = super.vterm.overrideAttrs(old: {
398+ buildInputs = old.buildInputs ++ [ self.emacs pkgs.cmake pkgs.libvterm-neovim ];
432399 cmakeFlags = [
433− "-DEMACS_SOURCE=${emacsSources}"
434− "-DUSE_SYSTEM_LIBVTERM=True"
400+ "-DEMACS_SOURCE=${self.emacs.src}"
401+ "-DUSE_SYSTEM_LIBVTERM=ON"
435402 ];
436−
437− installPhase = ''
438− install -d $out/share/emacs/site-lisp
439− install ../*.el $out/share/emacs/site-lisp
440− install ../*.so $out/share/emacs/site-lisp
403+ # we need the proper out directory to exist, so we do this in the
404+ # postInstall instead of postBuild
405+ postInstall = ''
406+ pushd source/build >/dev/null
407+ make
408+ install -m444 -t $out/share/emacs/site-lisp/elpa/vterm-** ../*.so
409+ popd > /dev/null
410+ rm -rf $out/share/emacs/site-lisp/elpa/vterm-**/{CMake*,build,*.c,*.h}
441411 '';
442− };
412+ });
443413 # Legacy alias
444414 emacs-libvterm = unstable.vterm;
445415