BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

emacs-packages: Drop zmq package

Browse source 
Use generated melpa package instead
This commit is contained in:
adisbladis 2019-08-04 19:08:35 +01:00
parent f7627be844
commit 460e02a9c0
No known key found for this signature in database
GPG key ID: 110BFAD44C6249B7
2 changed files with 16 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/applications/editors/emacs-modes/melpa-packages.nix
View file

@ -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";

36
pkgs/top-level/emacs-packages.nix
View file

@ -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: