diff options
author | Peter Hoeg <peter@hoeg.com> | 2019-10-28 12:23:21 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-28 12:23:21 +0800 |
commit | c833fb3179dcdf8f3135b3f904a3d4483a520fa8 (patch) | |
tree | bf5aecc0bb0b7d658171b2aed9bd837987f88ed8 /pkgs/applications/editors/emacs-modes | |
parent | d44842120e8d0609d863a16ed85258a20e85160c (diff) | |
parent | 4487809902c684a97fb19a7b41158968027e4ec0 (diff) | |
download | nixlib-c833fb3179dcdf8f3135b3f904a3d4483a520fa8.tar nixlib-c833fb3179dcdf8f3135b3f904a3d4483a520fa8.tar.gz nixlib-c833fb3179dcdf8f3135b3f904a3d4483a520fa8.tar.bz2 nixlib-c833fb3179dcdf8f3135b3f904a3d4483a520fa8.tar.lz nixlib-c833fb3179dcdf8f3135b3f904a3d4483a520fa8.tar.xz nixlib-c833fb3179dcdf8f3135b3f904a3d4483a520fa8.tar.zst nixlib-c833fb3179dcdf8f3135b3f904a3d4483a520fa8.zip |
Merge pull request #71347 from peterhoeg/f/emacs_vterm
emacsPackages.vterm: fix dynamic library and autoloaders
Diffstat (limited to 'pkgs/applications/editors/emacs-modes')
-rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-packages.nix | 56 |
1 files changed, 13 insertions, 43 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 374dfb411e77..0ad7b02befad 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -394,52 +394,22 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); - 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 { - inherit (super.vterm) name version src; - - nativeBuildInputs = [ pkgs.cmake ]; - buildInputs = [ self.emacs libvterm ]; - + vterm = super.vterm.overrideAttrs(old: { + buildInputs = old.buildInputs ++ [ self.emacs pkgs.cmake pkgs.libvterm-neovim ]; cmakeFlags = [ - "-DEMACS_SOURCE=${emacsSources}" - "-DUSE_SYSTEM_LIBVTERM=True" + "-DEMACS_SOURCE=${self.emacs.src}" + "-DUSE_SYSTEM_LIBVTERM=ON" ]; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install ../*.el $out/share/emacs/site-lisp - install ../*.so $out/share/emacs/site-lisp + # we need the proper out directory to exist, so we do this in the + # postInstall instead of postBuild + postInstall = '' + pushd source/build >/dev/null + make + install -m444 -t $out/share/emacs/site-lisp/elpa/vterm-** ../*.so + popd > /dev/null + rm -rf $out/share/emacs/site-lisp/elpa/vterm-**/{CMake*,build,*.c,*.h} ''; - }; + }); # Legacy alias emacs-libvterm = unstable.vterm; |