Revert "krb5: Fixes"

This reverts commit a74e4863f351e4cd2e0ec487b24cb3d1a91ccb9d.

1 files changed, 4 insertions, 6 deletions

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