libevent: split into multiple outputs
Hopefully all references are fixed.
This commit is contained in:
parent
38313d5d87
commit
6d86a93c43
@ -114,7 +114,7 @@ in
|
|||||||
#include <abstractions/nameservice>
|
#include <abstractions/nameservice>
|
||||||
|
|
||||||
${pkgs.glibc.out}/lib/*.so mr,
|
${pkgs.glibc.out}/lib/*.so mr,
|
||||||
${pkgs.libevent}/lib/libevent*.so* mr,
|
${pkgs.libevent.out}/lib/libevent*.so* mr,
|
||||||
${pkgs.curl}/lib/libcurl*.so* mr,
|
${pkgs.curl}/lib/libcurl*.so* mr,
|
||||||
${pkgs.openssl}/lib/libssl*.so* mr,
|
${pkgs.openssl}/lib/libssl*.so* mr,
|
||||||
${pkgs.openssl}/lib/libcrypto*.so* mr,
|
${pkgs.openssl}/lib/libcrypto*.so* mr,
|
||||||
|
@ -8,14 +8,14 @@ stdenv.mkDerivation {
|
|||||||
url = "mirror://sourceforge/levent/libevent-${version}-stable.tar.gz";
|
url = "mirror://sourceforge/levent/libevent-${version}-stable.tar.gz";
|
||||||
sha256 = "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki";
|
sha256 = "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki";
|
||||||
};
|
};
|
||||||
|
postPatch = "patchShebangs event_rpcgen.py";
|
||||||
|
|
||||||
|
outputs = [ "dev" "out" ];
|
||||||
|
outputBin = "dev";
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook ];
|
nativeBuildInputs = [ autoreconfHook ];
|
||||||
buildInputs = [ python ] ++ stdenv.lib.optional stdenv.isCygwin findutils;
|
buildInputs = [ python ] ++ stdenv.lib.optional stdenv.isCygwin findutils;
|
||||||
|
|
||||||
patchPhase = ''
|
|
||||||
patchShebangs event_rpcgen.py
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Event notification library";
|
description = "Event notification library";
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||||||
++ edf rootServer "root-server"
|
++ edf rootServer "root-server"
|
||||||
++ edf rrtypes "draft-rrtypes"
|
++ edf rrtypes "draft-rrtypes"
|
||||||
++ edf zoneStats "zone-stats"
|
++ edf zoneStats "zone-stats"
|
||||||
++ [ "--with-ssl=${openssl}" "--with-libevent=${libevent}" ];
|
++ [ "--with-ssl=${openssl.dev}" "--with-libevent=${libevent.dev}" ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
homepage = http://www.nlnetlabs.nl;
|
homepage = http://www.nlnetlabs.nl;
|
||||||
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||||||
"--with-privsep-user=smtpd"
|
"--with-privsep-user=smtpd"
|
||||||
"--with-queue-user=smtpq"
|
"--with-queue-user=smtpq"
|
||||||
"--with-ca-file=/etc/ssl/certs/ca-certificates.crt"
|
"--with-ca-file=/etc/ssl/certs/ca-certificates.crt"
|
||||||
"--with-libevent-dir=${libevent}"
|
"--with-libevent-dir=${libevent.dev}"
|
||||||
];
|
];
|
||||||
|
|
||||||
installFlags = [
|
installFlags = [
|
||||||
|
@ -1,5 +1,11 @@
|
|||||||
{ stdenv, fetchurl, libevent }:
|
{ stdenv, fetchurl, libevent, buildEnv }:
|
||||||
|
let
|
||||||
|
# failed to find a better way to make it work
|
||||||
|
libevent-comb = buildEnv {
|
||||||
|
inherit (libevent.out) name;
|
||||||
|
paths = [ libevent.dev libevent.out ];
|
||||||
|
};
|
||||||
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "nylon-1.21";
|
name = "nylon-1.21";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
@ -9,7 +15,7 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
patches = [ ./configure-use-solib.patch ];
|
patches = [ ./configure-use-solib.patch ];
|
||||||
|
|
||||||
configureFlags = [ "--with-libevent=${libevent}" ];
|
configureFlags = [ "--with-libevent=${libevent-comb}" ];
|
||||||
|
|
||||||
buildInputs = [ libevent ];
|
buildInputs = [ libevent ];
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ fetchgit, stdenv, zlib, docbook2x, pcre, curl, libxml2, libevent, perl
|
{ fetchgit, stdenv, zlib, bzip2, docbook2x, pcre, curl, libxml2, libevent, perl
|
||||||
, pkgconfig, protobuf, tokyocabinet, tokyotyrant, opencv, autoconf, automake
|
, pkgconfig, protobuf, tokyocabinet, tokyotyrant, opencv, autoconf, automake
|
||||||
, libtool, seeks_confDir ? ""
|
, libtool, seeks_confDir ? ""
|
||||||
}:
|
}:
|
||||||
@ -13,14 +13,14 @@ stdenv.mkDerivation {
|
|||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ zlib docbook2x pcre curl libxml2 libevent perl pkgconfig
|
[ zlib bzip2 docbook2x pcre curl libxml2 libevent perl pkgconfig
|
||||||
protobuf tokyocabinet tokyotyrant opencv autoconf automake libtool
|
protobuf tokyocabinet tokyotyrant opencv autoconf automake libtool
|
||||||
];
|
];
|
||||||
|
|
||||||
configureFlags =
|
configureFlags =
|
||||||
[ # Enable the built-in web server providing a web search interface.
|
[ # Enable the built-in web server providing a web search interface.
|
||||||
"--enable-httpserv-plugin=yes"
|
"--enable-httpserv-plugin=yes"
|
||||||
"--with-libevent=${libevent}"
|
"--with-libevent=${libevent.dev}"
|
||||||
];
|
];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
|
@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
|
|||||||
buildInputs = [ openssl expat libevent ];
|
buildInputs = [ openssl expat libevent ];
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-ssl=${openssl}"
|
"--with-ssl=${openssl.dev}"
|
||||||
"--with-libexpat=${expat}"
|
"--with-libexpat=${expat}"
|
||||||
"--with-libevent=${libevent}"
|
"--with-libevent=${libevent.dev}"
|
||||||
"--localstatedir=/var"
|
"--localstatedir=/var"
|
||||||
"--sysconfdir=/etc"
|
"--sysconfdir=/etc"
|
||||||
];
|
];
|
||||||
|
Loading…
Reference in New Issue
Block a user