heimdal: Fix darwin build

This commit is contained in:
Josef Kemetmüller 2018-05-22 02:29:14 +02:00 committed by Tuomas Tynkkynen
parent 9a100e3e31
commit 020957716e
2 changed files with 9 additions and 6 deletions

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, perl, yacc, flex { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, perl, yacc, flex
, texinfo, perlPackages , texinfo, perlPackages
, openldap, libcap_ng, sqlite, openssl, db, libedit, pam , openldap, libcap_ng, sqlite, openssl, db, libedit, pam
, CoreFoundation, Security, SystemConfiguration
# Extra Args # Extra Args
, type ? "" , type ? ""
}: }:
@ -26,8 +26,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex ] nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex ]
++ (with perlPackages; [ JSON ]) ++ (with perlPackages; [ JSON ])
++ optional (!libOnly) texinfo; ++ optional (!libOnly) texinfo;
buildInputs = optionals (!stdenv.isFreeBSD) [ libcap_ng db ] buildInputs = optionals (stdenv.isLinux) [ libcap_ng ]
++ [ sqlite openssl libedit ] ++ [ db sqlite openssl libedit ]
++ optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ]
++ optionals (!libOnly) [ openldap pam ]; ++ optionals (!libOnly) [ openldap pam ];
## ugly, X should be made an option ## ugly, X should be made an option
@ -43,7 +44,7 @@ stdenv.mkDerivation rec {
"--with-berkeley-db-include=${db.dev}/include" "--with-berkeley-db-include=${db.dev}/include"
] ++ optionals (!libOnly) [ ] ++ optionals (!libOnly) [
"--with-openldap=${openldap.dev}" "--with-openldap=${openldap.dev}"
] ++ optionals (!stdenv.isFreeBSD) [ ] ++ optionals (stdenv.isLinux) [
"--with-capng" "--with-capng"
]; ];
@ -93,7 +94,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "An implementation of Kerberos 5 (and some more stuff)"; description = "An implementation of Kerberos 5 (and some more stuff)";
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.linux ++ platforms.freebsd; platforms = platforms.unix;
maintainers = with maintainers; [ wkennington ]; maintainers = with maintainers; [ wkennington ];
}; };

View file

@ -9411,7 +9411,9 @@ with pkgs;
hamlib = callPackage ../development/libraries/hamlib { }; hamlib = callPackage ../development/libraries/hamlib { };
heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; heimdal = callPackage ../development/libraries/kerberos/heimdal.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
};
libheimdal = heimdal.override { type = "lib"; }; libheimdal = heimdal.override { type = "lib"; };
harfbuzz = callPackage ../development/libraries/harfbuzz { }; harfbuzz = callPackage ../development/libraries/harfbuzz { };