From 5a3da5ac93767e5644589159e253697b8b09fc74 Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Mon, 22 Aug 2022 14:31:38 +0200 Subject: ucommon: remove broken openssl support --- pkgs/development/libraries/ucommon/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'pkgs/development/libraries/ucommon/default.nix') diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 2ecf7729f4bfe..09e6e2d6a03ca 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -1,14 +1,7 @@ { lib, stdenv, fetchurl, pkg-config -, openssl ? null, zlib ? null, gnutls ? null +, gnutls }: -let - xor = a: b: (a || b) && (!(a && b)); -in - -assert xor (openssl != null) (gnutls != null); -assert !(xor (openssl != null) (zlib != null)); - stdenv.mkDerivation rec { pname = "ucommon"; version = "7.0.0"; @@ -29,8 +22,8 @@ stdenv.mkDerivation rec { --replace 'ifndef UCOMMON_SYSRUNTIME' 'if 0' ''; - # ucommon.pc has link time depdendencies on -lssl, -lcrypto, -lz, -lgnutls - propagatedBuildInputs = [ openssl zlib gnutls ]; + # ucommon.pc has link time depdendencies on -lusecure -lucommon -lgnutls + propagatedBuildInputs = [ gnutls ]; doCheck = true; @@ -38,7 +31,6 @@ stdenv.mkDerivation rec { description = "C++ library to facilitate using C++ design patterns"; homepage = "https://www.gnu.org/software/commoncpp/"; license = lib.licenses.lgpl3Plus; - maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; -- cgit 1.4.1