b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #187863 from SuperSandro2000/ucommon

Browse source
This commit is contained in:
Sandro 2022-08-24 20:49:51 +02:00 committed by GitHub
parent 63cf035632 5a3da5ac93
commit a0e15996f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/development/libraries/ucommon/default.nix
View file

@ -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;
};

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

@ -21765,10 +21765,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 { };