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

Merge pull request #65049 from matthewbauer/zmq-enable-drafts

Browse Source 
zmq: enable drafts api
This commit is contained in:
Matthew Bauer 2019-07-25 09:54:00 -04:00 committed by GitHub
commit 6ff7c2ca93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/zeromq/4.x.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, asciidoc }: { stdenv, fetchFromGitHub, cmake, asciidoc, enableDrafts ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "zeromq-${version}"; name = "zeromq-${version}";
@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
doCheck = false; # fails all the tests (ctest) doCheck = false; # fails all the tests (ctest)
cmakeFlags = if enableDrafts then [ "-DENABLE_DRAFTS=ON" ] else null;
meta = with stdenv.lib; { meta = with stdenv.lib; {
branch = "4"; branch = "4";
homepage = http://www.zeromq.org; homepage = http://www.zeromq.org;

5
pkgs/top-level/emacs-packages.nix
View File

@ -434,7 +434,10 @@ let
}; };
stripDebugList = [ "share" ]; stripDebugList = [ "share" ];
packageRequires = [ emacs ]; packageRequires = [ emacs ];
nativeBuildInputs = [ external.autoconf external.automake external.pkgconfig external.libtool external.zeromq ]; nativeBuildInputs = [
external.autoconf external.automake external.pkgconfig external.libtool
(external.zeromq.override { enableDrafts = true; })
];
preBuild = '' preBuild = ''
make make
''; '';