From 3b8e595810fc8faa89a81d4a4c4064bb5cf24e8a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 18 Jul 2019 23:09:55 -0400 Subject: zmq: add enableDrafts option This is needed by emacs-zmq, and will be used by it. --- pkgs/development/libraries/zeromq/4.x.nix | 4 +++- pkgs/top-level/emacs-packages.nix | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 9fc0c4ac230..506db644142 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc }: +{ stdenv, fetchFromGitHub, cmake, asciidoc, enableDrafts ? false }: stdenv.mkDerivation rec { name = "zeromq-${version}"; @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { doCheck = false; # fails all the tests (ctest) + cmakeFlags = if enableDrafts then [ "-DENABLE_DRAFTS=ON" ] else null; + meta = with stdenv.lib; { branch = "4"; homepage = http://www.zeromq.org; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 29600670f61..6696520c33e 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -434,7 +434,10 @@ let }; stripDebugList = [ "share" ]; 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 = '' make ''; -- cgit 1.4.1