heimdal: Fix darwin build

authored by

Josef Kemetmüller and committed by
Tuomas Tynkkynen
02095771 9a100e3e

+9 -6
+6 -5
pkgs/development/libraries/kerberos/heimdal.nix
··· 1 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, perl, yacc, flex 2 , texinfo, perlPackages 3 , openldap, libcap_ng, sqlite, openssl, db, libedit, pam 4 - 5 # Extra Args 6 , type ? "" 7 }: ··· 26 nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex ] 27 ++ (with perlPackages; [ JSON ]) 28 ++ optional (!libOnly) texinfo; 29 - buildInputs = optionals (!stdenv.isFreeBSD) [ libcap_ng db ] 30 - ++ [ sqlite openssl libedit ] 31 ++ optionals (!libOnly) [ openldap pam ]; 32 33 ## ugly, X should be made an option ··· 43 "--with-berkeley-db-include=${db.dev}/include" 44 ] ++ optionals (!libOnly) [ 45 "--with-openldap=${openldap.dev}" 46 - ] ++ optionals (!stdenv.isFreeBSD) [ 47 "--with-capng" 48 ]; 49 ··· 93 meta = { 94 description = "An implementation of Kerberos 5 (and some more stuff)"; 95 license = licenses.bsd3; 96 - platforms = platforms.linux ++ platforms.freebsd; 97 maintainers = with maintainers; [ wkennington ]; 98 }; 99
··· 1 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, perl, yacc, flex 2 , texinfo, perlPackages 3 , openldap, libcap_ng, sqlite, openssl, db, libedit, pam 4 + , CoreFoundation, Security, SystemConfiguration 5 # Extra Args 6 , type ? "" 7 }: ··· 26 nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex ] 27 ++ (with perlPackages; [ JSON ]) 28 ++ optional (!libOnly) texinfo; 29 + buildInputs = optionals (stdenv.isLinux) [ libcap_ng ] 30 + ++ [ db sqlite openssl libedit ] 31 + ++ optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ] 32 ++ optionals (!libOnly) [ openldap pam ]; 33 34 ## ugly, X should be made an option ··· 44 "--with-berkeley-db-include=${db.dev}/include" 45 ] ++ optionals (!libOnly) [ 46 "--with-openldap=${openldap.dev}" 47 + ] ++ optionals (stdenv.isLinux) [ 48 "--with-capng" 49 ]; 50 ··· 94 meta = { 95 description = "An implementation of Kerberos 5 (and some more stuff)"; 96 license = licenses.bsd3; 97 + platforms = platforms.unix; 98 maintainers = with maintainers; [ wkennington ]; 99 }; 100
+3 -1
pkgs/top-level/all-packages.nix
··· 9411 9412 hamlib = callPackage ../development/libraries/hamlib { }; 9413 9414 - heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; 9415 libheimdal = heimdal.override { type = "lib"; }; 9416 9417 harfbuzz = callPackage ../development/libraries/harfbuzz { };
··· 9411 9412 hamlib = callPackage ../development/libraries/hamlib { }; 9413 9414 + heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { 9415 + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; 9416 + }; 9417 libheimdal = heimdal.override { type = "lib"; }; 9418 9419 harfbuzz = callPackage ../development/libraries/harfbuzz { };