about summary refs log tree commit diff
path: root/pkgs/development/libraries
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2020-01-13 10:03:12 +0000
committerGitHub <noreply@github.com>2020-01-13 10:03:12 +0000
commit2c962821f2c1c9180bb3890e42ae7b5cb23b77b0 (patch)
treed16d7eeb269434f5df22305f53a96a74a141f158 /pkgs/development/libraries
parent36f084b2bbcbfba0da7605d80a731111b36084fc (diff)
parent3a22c758094fe415c3b8a3e79a88f16dc67799d5 (diff)
downloadnixlib-2c962821f2c1c9180bb3890e42ae7b5cb23b77b0.tar
nixlib-2c962821f2c1c9180bb3890e42ae7b5cb23b77b0.tar.gz
nixlib-2c962821f2c1c9180bb3890e42ae7b5cb23b77b0.tar.bz2
nixlib-2c962821f2c1c9180bb3890e42ae7b5cb23b77b0.tar.lz
nixlib-2c962821f2c1c9180bb3890e42ae7b5cb23b77b0.tar.xz
nixlib-2c962821f2c1c9180bb3890e42ae7b5cb23b77b0.tar.zst
nixlib-2c962821f2c1c9180bb3890e42ae7b5cb23b77b0.zip
Merge pull request #77568 from bhipple/fix/cpp-netlib-openssl
cpp-netlib: remove insecure openssl dependency and unnecessary asio
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r--pkgs/development/libraries/cpp-netlib/default.nix16
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix
index a4729cdeaed8..31c4c70dd9d0 100644
--- a/pkgs/development/libraries/cpp-netlib/default.nix
+++ b/pkgs/development/libraries/cpp-netlib/default.nix
@@ -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;