diff options
-rw-r--r-- | pkgs/development/libraries/ucommon/default.nix | 14 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 4 insertions, 15 deletions
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; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99ca3ec350851..2978b9942c140 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21711,10 +21711,7 @@ with pkgs; utmps = skawarePackages.utmps; - ucommon = callPackage ../development/libraries/ucommon { - openssl = null; - zlib = null; - }; + ucommon = callPackage ../development/libraries/ucommon { }; v8 = callPackage ../development/libraries/v8 { }; |