wolfssl: 4.5.0 -> 4.6.0

breaks dependency cycle, uses --enable-all to ensure options.h is installed
This commit is contained in:
Matthias C. M. Troffaes 2021-02-02 14:41:51 -08:00 committed by Felix Lechner
parent 601a2cb9fd
commit 18e675cf31

View file

@ -2,21 +2,33 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wolfssl"; pname = "wolfssl";
version = "4.5.0"; version = "4.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wolfSSL"; owner = "wolfSSL";
repo = "wolfssl"; repo = "wolfssl";
rev = "v${version}-stable"; rev = "v${version}-stable";
sha256 = "138ppnwkqkfi7nnqpd0b93dqaph72ma65m9286bz2qzlis1x8r0v"; sha256 = "0hk3bnzznxj047gwxdxw2v3w6jqq47996m7g72iwj6c2ai9g6h4m";
}; };
configureFlags = [ "--enable-all" ]; # almost same as Debian but for now using --enable-all instead of --enable-distro to ensure options.h gets installed
configureFlags = [ "--enable-all --enable-pkcs11 --enable-tls13 --enable-base64encode" ];
outputs = [ "out" "dev" "doc" "lib" ]; outputs = [ "out" "dev" "doc" "lib" ];
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
postPatch = ''
# fix recursive cycle:
# build flags (including location of header files) are exposed in the
# public API of wolfssl, causing lib to depend on dev
substituteInPlace configure.ac \
--replace '#define LIBWOLFSSL_CONFIGURE_ARGS \"$ac_configure_args\"' ' '
substituteInPlace configure.ac \
--replace '#define LIBWOLFSSL_GLOBAL_CFLAGS \"$CPPFLAGS $AM_CPPFLAGS $CFLAGS $AM_CFLAGS\"' ' '
'';
postInstall = '' postInstall = ''
# fix recursive cycle: # fix recursive cycle:
# wolfssl-config points to dev, dev propagates bin # wolfssl-config points to dev, dev propagates bin