pkgs/development/libraries: stdenv.lib -> lib
This commit is contained in:
committed by
Jonathan Ringer
parent
046d24424e
commit
66e44425c6
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, findutils, fixDarwinDylibNames
|
||||
{ lib, stdenv, fetchurl, findutils, fixDarwinDylibNames
|
||||
, sslSupport? true, openssl
|
||||
}:
|
||||
|
||||
@@ -16,25 +16,25 @@ stdenv.mkDerivation rec {
|
||||
# libevent_openssl is moved into its own output, so that openssl isn't present
|
||||
# in the default closure.
|
||||
outputs = [ "out" "dev" ]
|
||||
++ stdenv.lib.optional sslSupport "openssl"
|
||||
++ lib.optional sslSupport "openssl"
|
||||
;
|
||||
outputBin = "dev";
|
||||
propagatedBuildOutputs = [ "out" ]
|
||||
++ stdenv.lib.optional sslSupport "openssl"
|
||||
++ lib.optional sslSupport "openssl"
|
||||
;
|
||||
|
||||
nativeBuildInputs = []
|
||||
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
|
||||
++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
|
||||
;
|
||||
|
||||
buildInputs = []
|
||||
++ stdenv.lib.optional sslSupport openssl
|
||||
++ stdenv.lib.optional stdenv.isCygwin findutils
|
||||
++ lib.optional sslSupport openssl
|
||||
++ lib.optional stdenv.isCygwin findutils
|
||||
;
|
||||
|
||||
doCheck = false; # needs the net
|
||||
|
||||
postInstall = stdenv.lib.optionalString sslSupport ''
|
||||
postInstall = lib.optionalString sslSupport ''
|
||||
moveToOutput "lib/libevent_openssl*" "$openssl"
|
||||
substituteInPlace "$dev/lib/pkgconfig/libevent_openssl.pc" \
|
||||
--replace "$out" "$openssl"
|
||||
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Event notification library";
|
||||
longDescription = ''
|
||||
The libevent API provides a mechanism to execute a callback function
|
||||
|
||||
Reference in New Issue
Block a user