diff options
| -rw-r--r-- | pkgs/development/libraries/kerberos/heimdal.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 36ee3fe2d3a..24adb2a141e 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, perl, yacc, flex , texinfo, perlPackages , openldap, libcap_ng, sqlite, openssl, db, libedit, pam - +, CoreFoundation, Security, SystemConfiguration # Extra Args , type ? "" }: @@ -26,8 +26,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex ] ++ (with perlPackages; [ JSON ]) ++ optional (!libOnly) texinfo; - buildInputs = optionals (!stdenv.isFreeBSD) [ libcap_ng db ] - ++ [ sqlite openssl libedit ] + buildInputs = optionals (stdenv.isLinux) [ libcap_ng ] + ++ [ db sqlite openssl libedit ] + ++ optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ] ++ optionals (!libOnly) [ openldap pam ]; ## ugly, X should be made an option @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { "--with-berkeley-db-include=${db.dev}/include" ] ++ optionals (!libOnly) [ "--with-openldap=${openldap.dev}" - ] ++ optionals (!stdenv.isFreeBSD) [ + ] ++ optionals (stdenv.isLinux) [ "--with-capng" ]; @@ -93,7 +94,7 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of Kerberos 5 (and some more stuff)"; license = licenses.bsd3; - platforms = platforms.linux ++ platforms.freebsd; + platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3efdf7de0ef..e3074cbf80a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9411,7 +9411,9 @@ with pkgs; 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"; }; harfbuzz = callPackage ../development/libraries/harfbuzz { }; |