From 7fc87a4cbd77eda2ab261f3f9ceee765b8fe6ae1 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 10 Jul 2019 22:13:26 -0400 Subject: [PATCH] emacs: add zmq package This builds emacs-zmq.so automatically. Fixes #59774 --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/emacs-packages.nix | 33 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54f2cab11d4..b72949cb020 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17716,7 +17716,7 @@ in inherit (pythonPackages) elpy; inherit autoconf automake git libffi libpng pkgconfig poppler rtags w3m zlib - substituteAll rustPlatform cmake llvmPackages; + substituteAll rustPlatform cmake llvmPackages libtool zeromq; }; }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 953c25de0e8..460d5fd5461 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -417,6 +417,39 @@ 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 ]; + 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