diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/ucommon | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/ucommon')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/ucommon/default.nix | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/libraries/ucommon/default.nix b/nixpkgs/pkgs/development/libraries/ucommon/default.nix index 2ecf7729f4bf..09e6e2d6a03c 100644 --- a/nixpkgs/pkgs/development/libraries/ucommon/default.nix +++ b/nixpkgs/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; }; |