public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "krb5: Fixes"

Browse Source 
This reverts commit a74e4863f351e4cd2e0ec487b24cb3d1a91ccb9d.
This commit is contained in:
Eelco Dolstra 2015-06-01 21:03:44 +02:00
parent c449f292d2
commit 1b32ae03f3
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/kerberos/krb5.nix
View File

@ -3,7 +3,7 @@
# Optional Dependencies # Optional Dependencies
, libedit ? null, readline ? null, ncurses ? null, libverto ? null , libedit ? null, readline ? null, ncurses ? null, libverto ? null
, openldap ? null , openldap ? null, db ? null
# Crypto Dependencies # Crypto Dependencies
, openssl ? null, nss ? null, nspr ? null , openssl ? null, nss ? null, nspr ? null
@ -24,6 +24,7 @@ let
optNcurses = if libOnly then null else shouldUsePkg ncurses; optNcurses = if libOnly then null else shouldUsePkg ncurses;
optLibverto = shouldUsePkg libverto; optLibverto = shouldUsePkg libverto;
optOpenldap = if libOnly then null else shouldUsePkg openldap; optOpenldap = if libOnly then null else shouldUsePkg openldap;
optDb = if libOnly then null else shouldUsePkg db;
# Prefer the openssl implementation # Prefer the openssl implementation
cryptoStr = if optOpenssl != null then "openssl" cryptoStr = if optOpenssl != null then "openssl"
@ -93,7 +94,7 @@ stdenv.mkDerivation rec {
(mkWith (optLibverto != null) "system-verto" null) (mkWith (optLibverto != null) "system-verto" null)
(mkWith (optOpenldap != null) "ldap" null) (mkWith (optOpenldap != null) "ldap" null)
(mkWith false "tcl" null) (mkWith false "tcl" null)
(mkWith false "system-db" null) # Requires db v1.85 (mkWith (optDb != null) "system-db" null)
]; ];
buildPhase = optionalString libOnly '' buildPhase = optionalString libOnly ''
@ -105,14 +106,11 @@ stdenv.mkDerivation rec {
installPhase = optionalString libOnly '' installPhase = optionalString libOnly ''
mkdir -p $out/{bin,include/{gssapi,gssrpc,kadm5,krb5},lib/pkgconfig,sbin,share/{et,man/man1}} mkdir -p $out/{bin,include/{gssapi,gssrpc,kadm5,krb5},lib/pkgconfig,sbin,share/{et,man/man1}}
(cd util; make install) (cd util; make install)
(cd include; make install) (cd include; make install)
(cd lib; make install) (cd lib; make install)
(cd build-tools; make install) (cd build-tools; make install)
rm -rf $out/{bin,sbin,share}
rm -rf $out/{sbin,share}
find $out/bin -type f | grep -v 'krb5-config' | xargs rm
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;