cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #77568 from bhipple/fix/cpp-netlib-openssl

Browse source 
cpp-netlib: remove insecure openssl dependency and unnecessary asio
This commit is contained in:
Jörg Thalheim 2020-01-13 10:03:12 +00:00 committed by GitHub
commit 2c962821f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/libraries/cpp-netlib/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, boost, openssl, asio }:
{ stdenv, fetchFromGitHub, cmake, boost, openssl }:
stdenv.mkDerivation rec {
pname = "cpp-netlib";
@ -14,18 +14,22 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake boost openssl ];
# This can be removed when updating to 0.13, see https://github.com/cpp-netlib/cpp-netlib/issues/629
propagatedBuildInputs = [ asio ];
cmakeFlags = [
"-DCPP-NETLIB_BUILD_SHARED_LIBS=ON"
];
enableParallelBuilding = true;
# The test driver binary lacks an RPath to the library's libs
preCheck = ''
export LD_LIBRARY_PATH=$PWD/libs/network/src
'';
# Most tests make network GET requests to various websites
doCheck = false;
meta = with stdenv.lib; {
description =
"Collection of open-source libraries for high level network programming";
description = "Collection of open-source libraries for high level network programming";
homepage = https://cpp-netlib.org;
license = licenses.boost;
platforms = platforms.all;

5
pkgs/top-level/all-packages.nix
View file

@ -11065,9 +11065,8 @@ in
cpp-ipfs-api = callPackage ../development/libraries/cpp-ipfs-api { };
cpp-netlib = callPackage ../development/libraries/cpp-netlib {
openssl = openssl_1_0_2;
};
cpp-netlib = callPackage ../development/libraries/cpp-netlib {};
uri = callPackage ../development/libraries/uri { };
cppcms = callPackage ../development/libraries/cppcms { };