diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/libevent | |
parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libevent')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libevent/default.nix | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libevent/default.nix b/nixpkgs/pkgs/development/libraries/libevent/default.nix index 24ded54d8e97..bd5edec68a06 100644 --- a/nixpkgs/pkgs/development/libraries/libevent/default.nix +++ b/nixpkgs/pkgs/development/libraries/libevent/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchurl, findutils, fixDarwinDylibNames -, sslSupport? true, openssl +, sslSupport ? true, openssl +, fetchpatch }: -assert sslSupport -> openssl != null; - stdenv.mkDerivation rec { pname = "libevent"; version = "2.1.12"; @@ -13,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1fq30imk8zd26x8066di3kpc5zyfc5z6frr3zll685zcx4dxxrlj"; }; + patches = [ + # Don't define BIO_get_init() for LibreSSL 3.5+ + (fetchpatch { + url = "https://github.com/libevent/libevent/commit/883630f76cbf512003b81de25cd96cb75c6cf0f9.patch"; + sha256 = "sha256-VPJqJUAovw6V92jpqIXkIR1xYGbxIWxaHr8cePWI2SU="; + }) + ]; + preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 ''; @@ -27,14 +34,10 @@ stdenv.mkDerivation rec { ++ lib.optional sslSupport "openssl" ; - nativeBuildInputs = [] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames - ; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [] - ++ lib.optional sslSupport openssl - ++ lib.optional stdenv.isCygwin findutils - ; + buildInputs = lib.optional sslSupport openssl + ++ lib.optional stdenv.isCygwin findutils; doCheck = false; # needs the net |