libevent: split into multiple outputs

Hopefully all references are fixed.

+21 -15
+1 -1
nixos/modules/services/torrent/transmission.nix
··· 114 114 #include <abstractions/nameservice> 115 115 116 116 ${pkgs.glibc.out}/lib/*.so mr, 117 - ${pkgs.libevent}/lib/libevent*.so* mr, 117 + ${pkgs.libevent.out}/lib/libevent*.so* mr, 118 118 ${pkgs.curl}/lib/libcurl*.so* mr, 119 119 ${pkgs.openssl}/lib/libssl*.so* mr, 120 120 ${pkgs.openssl}/lib/libcrypto*.so* mr,
+4 -4
pkgs/development/libraries/libevent/default.nix
··· 8 8 url = "mirror://sourceforge/levent/libevent-${version}-stable.tar.gz"; 9 9 sha256 = "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki"; 10 10 }; 11 + postPatch = "patchShebangs event_rpcgen.py"; 12 + 13 + outputs = [ "dev" "out" ]; 14 + outputBin = "dev"; 11 15 12 16 nativeBuildInputs = [ autoreconfHook ]; 13 17 buildInputs = [ python ] ++ stdenv.lib.optional stdenv.isCygwin findutils; 14 - 15 - patchPhase = '' 16 - patchShebangs event_rpcgen.py 17 - ''; 18 18 19 19 meta = with stdenv.lib; { 20 20 description = "Event notification library";
+1 -1
pkgs/servers/dns/nsd/default.nix
··· 35 35 ++ edf rootServer "root-server" 36 36 ++ edf rrtypes "draft-rrtypes" 37 37 ++ edf zoneStats "zone-stats" 38 - ++ [ "--with-ssl=${openssl}" "--with-libevent=${libevent}" ]; 38 + ++ [ "--with-ssl=${openssl.dev}" "--with-libevent=${libevent.dev}" ]; 39 39 40 40 meta = with stdenv.lib; { 41 41 homepage = http://www.nlnetlabs.nl;
+1 -1
pkgs/servers/mail/opensmtpd/default.nix
··· 26 26 "--with-privsep-user=smtpd" 27 27 "--with-queue-user=smtpq" 28 28 "--with-ca-file=/etc/ssl/certs/ca-certificates.crt" 29 - "--with-libevent-dir=${libevent}" 29 + "--with-libevent-dir=${libevent.dev}" 30 30 ]; 31 31 32 32 installFlags = [
+9 -3
pkgs/tools/networking/nylon/default.nix
··· 1 - { stdenv, fetchurl, libevent }: 2 - 1 + { stdenv, fetchurl, libevent, buildEnv }: 2 + let 3 + # failed to find a better way to make it work 4 + libevent-comb = buildEnv { 5 + inherit (libevent.out) name; 6 + paths = [ libevent.dev libevent.out ]; 7 + }; 8 + in 3 9 stdenv.mkDerivation { 4 10 name = "nylon-1.21"; 5 11 src = fetchurl { ··· 9 15 10 16 patches = [ ./configure-use-solib.patch ]; 11 17 12 - configureFlags = [ "--with-libevent=${libevent}" ]; 18 + configureFlags = [ "--with-libevent=${libevent-comb}" ]; 13 19 14 20 buildInputs = [ libevent ]; 15 21
+3 -3
pkgs/tools/networking/p2p/seeks/default.nix
··· 1 - { fetchgit, stdenv, zlib, docbook2x, pcre, curl, libxml2, libevent, perl 1 + { fetchgit, stdenv, zlib, bzip2, docbook2x, pcre, curl, libxml2, libevent, perl 2 2 , pkgconfig, protobuf, tokyocabinet, tokyotyrant, opencv, autoconf, automake 3 3 , libtool, seeks_confDir ? "" 4 4 }: ··· 13 13 }; 14 14 15 15 buildInputs = 16 - [ zlib docbook2x pcre curl libxml2 libevent perl pkgconfig 16 + [ zlib bzip2 docbook2x pcre curl libxml2 libevent perl pkgconfig 17 17 protobuf tokyocabinet tokyotyrant opencv autoconf automake libtool 18 18 ]; 19 19 20 20 configureFlags = 21 21 [ # Enable the built-in web server providing a web search interface. 22 22 "--enable-httpserv-plugin=yes" 23 - "--with-libevent=${libevent}" 23 + "--with-libevent=${libevent.dev}" 24 24 ]; 25 25 26 26 preConfigure = ''
+2 -2
pkgs/tools/networking/unbound/default.nix
··· 14 14 buildInputs = [ openssl expat libevent ]; 15 15 16 16 configureFlags = [ 17 - "--with-ssl=${openssl}" 17 + "--with-ssl=${openssl.dev}" 18 18 "--with-libexpat=${expat}" 19 - "--with-libevent=${libevent}" 19 + "--with-libevent=${libevent.dev}" 20 20 "--localstatedir=/var" 21 21 "--sysconfdir=/etc" 22 22 ];