public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #60925 from ruuda/libressl-291 

libressl: 2.9.0 -> 2.9.1
This commit is contained in:
Austin Seipp 2019-05-07 17:23:52 -05:00 committed by GitHub
parent 64f7cb24d5 5f594be463
commit 27fd944bb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/libraries/libressl/default.nix
View File

@ -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";
};
}