diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 9d9134e51a9f..f8ef53e6d211 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -183,6 +183,22 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # upstream issue: missing file header window-numbering = markBroken super.window-numbering; + zmq = super.zmq.overrideAttrs(old: { + stripDebugList = [ "share" ]; + preBuild = '' + make + ''; + nativeBuildInputs = [ + external.autoconf external.automake external.pkgconfig external.libtool + (external.zeromq.override { enableDrafts = true; }) + ]; + postInstall = '' + mv $out/share/emacs/site-lisp/elpa/zmq-*/src/.libs/emacs-zmq.so $out/share/emacs/site-lisp/elpa/zmq-* + rm -r $out/share/emacs/site-lisp/elpa/zmq-*/src + rm $out/share/emacs/site-lisp/elpa/zmq-*/Makefile + ''; + }); + # Map legacy renames from emacs2nix since code generation was ported to emacs lisp _0blayout = super."0blayout"; _0xc = super."0xc"; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 5547e01cd155..9a232c6899d2 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -302,42 +302,6 @@ let zeitgeist = callPackage ../applications/editors/emacs-modes/zeitgeist { }; - zmq = melpaBuild rec { - pname = "zmq"; - ename = "zmq"; - version = "0.10.10"; - src = fetchFromGitHub { - owner = "dzop"; - repo = "emacs-zmq"; - rev = "v0.10.10"; - sha256 = "0ngxm5mm0kqgvn8977ryrngamx0khzlw86d8vz5s0jhm2kgwnqp8"; - }; - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/72f4dcc2723de826bf1af7235ac6d9119a243c63/recipes/zmq"; - sha256 = "14bbh00a58xgxyxl8zjxl57rf6351fnwsnk4cvvy341fvf86dklc"; - name = "recipe"; - }; - stripDebugList = [ "share" ]; - packageRequires = [ emacs ]; - nativeBuildInputs = [ - external.autoconf external.automake external.pkgconfig external.libtool - (external.zeromq.override { enableDrafts = true; }) - ]; - preBuild = '' - make - ''; - postInstall = '' - mv $out/share/emacs/site-lisp/elpa/zmq-*/src/.libs/emacs-zmq.so $out/share/emacs/site-lisp/elpa/zmq-* - rm -r $out/share/emacs/site-lisp/elpa/zmq-*/src - rm $out/share/emacs/site-lisp/elpa/zmq-*/Makefile - ''; - meta = { - homepage = "https://melpa.org/#/zmq"; - description = "Emacs bindings to ØMQ"; - license = lib.licenses.gpl2; - }; - }; - }; in lib.makeScope newScope (self: