public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #119874 from veprbl/pr/zmq_fix

Browse Source 
emacsPackages.melpaPackages.zmq: preventive fix for module-file-suffix change needed for emacs 28
This commit is contained in:
Dmitry Kalinkin 2021-05-03 17:51:05 -04:00 committed by GitHub
commit e5b86d7ac0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/editors/emacs-modes/melpa-packages.nix
View File

@ -362,6 +362,7 @@ let
zmq = super.zmq.overrideAttrs (old: { zmq = super.zmq.overrideAttrs (old: {
stripDebugList = [ "share" ]; stripDebugList = [ "share" ];
preBuild = '' preBuild = ''
export EZMQ_LIBDIR=$(mktemp -d)
make make
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
@ -372,7 +373,7 @@ let
(pkgs.zeromq.override { enableDrafts = true; }) (pkgs.zeromq.override { enableDrafts = true; })
]; ];
postInstall = '' postInstall = ''
mv $out/share/emacs/site-lisp/elpa/zmq-*/src/.libs/emacs-zmq.so $out/share/emacs/site-lisp/elpa/zmq-* mv $EZMQ_LIBDIR/emacs-zmq.* $out/share/emacs/site-lisp/elpa/zmq-*
rm -r $out/share/emacs/site-lisp/elpa/zmq-*/src rm -r $out/share/emacs/site-lisp/elpa/zmq-*/src
rm $out/share/emacs/site-lisp/elpa/zmq-*/Makefile rm $out/share/emacs/site-lisp/elpa/zmq-*/Makefile
''; '';