diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
tree | ac3e9b27576a0382335532d126f9a66d486bc638 /nixpkgs/pkgs/development/libraries/wolfssl/default.nix | |
parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/wolfssl/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/wolfssl/default.nix | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix index 48178e774093..4635a80152de 100644 --- a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix @@ -2,33 +2,22 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "0hk3bnzznxj047gwxdxw2v3w6jqq47996m7g72iwj6c2ai9g6h4m"; + sha256 = "1aa51j0xnhi49izc8djya68l70jkjv25559pgybfb9sa4fa4gz97"; }; - # 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" ]; + # almost same as Debian but for now using --enable-all --enable-reproducible-build instead of --enable-distro to ensure options.h gets installed + configureFlags = [ "--enable-all" "--enable-reproducible-build" "--enable-pkcs11" "--enable-tls13" "--enable-base64encode" ]; outputs = [ "out" "dev" "doc" "lib" ]; 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 = '' # fix recursive cycle: # wolfssl-config points to dev, dev propagates bin @@ -41,7 +30,7 @@ stdenv.mkDerivation rec { description = "A small, fast, portable implementation of TLS/SSL for embedded devices"; homepage = "https://www.wolfssl.com/"; platforms = platforms.all; - license = lib.licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ mcmtroffaes ]; }; } |