diff options
author | Austin Seipp <aseipp@pobox.com> | 2019-05-07 17:23:52 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-07 17:23:52 -0500 |
commit | 27fd944bb73f70377379a8a59ac3a88fd32e26bf (patch) | |
tree | 5596d02f23f9b5beee231db2a3858bb8a3a87a46 /pkgs | |
parent | 64f7cb24d5f9a3c6132e018befc2caec7400d114 (diff) | |
parent | 5f594be46317e71e66e587670ebbf95e386ac365 (diff) | |
download | nixlib-27fd944bb73f70377379a8a59ac3a88fd32e26bf.tar nixlib-27fd944bb73f70377379a8a59ac3a88fd32e26bf.tar.gz nixlib-27fd944bb73f70377379a8a59ac3a88fd32e26bf.tar.bz2 nixlib-27fd944bb73f70377379a8a59ac3a88fd32e26bf.tar.lz nixlib-27fd944bb73f70377379a8a59ac3a88fd32e26bf.tar.xz nixlib-27fd944bb73f70377379a8a59ac3a88fd32e26bf.tar.zst nixlib-27fd944bb73f70377379a8a59ac3a88fd32e26bf.zip |
Merge pull request #60925 from ruuda/libressl-291
libressl: 2.9.0 -> 2.9.1
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/libressl/default.nix | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 11ed2eb0044a..e694c353df09 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib }: +{ stdenv, fetchurl, lib, cmake }: let @@ -11,7 +11,17 @@ let inherit sha256; }; - configureFlags = [ "--enable-nc" ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DENABLE_NC=ON" "-DBUILD_SHARED_LIBS=ON" ]; + + # The autoconf build is broken as of 2.9.1, resulting in the following error: + # libressl-2.9.1/tls/.libs/libtls.a', needed by 'handshake_table'. + # Fortunately LibreSSL provides a CMake build as well, so opt for CMake by + # removing ./configure pre-config. + preConfigure = '' + rm configure + ''; enableParallelBuilding = true; @@ -19,6 +29,8 @@ let postFixup = '' moveToOutput "bin/nc" "$nc" + moveToOutput "bin/openssl" "$bin" + moveToOutput "bin/ocspcheck" "$bin" moveToOutput "share/man/man1/nc.1${lib.optionalString (dontGzipMan==null) ".gz"}" "$nc" ''; @@ -46,7 +58,7 @@ in { }; libressl_2_9 = generic { - version = "2.9.0"; - sha256 = "1x1wl6b449m6hfhyxxzxbf2v8yfb5q92q6d01hdg28xp1222jpzb"; + version = "2.9.1"; + sha256 = "1y32iz64rqh74m1g641b39h3293dqi4la7i0ckai1p4lcs2xvr1r"; }; } |