From 4fa5cc71f2d5c5b8f6b5d71cd321d9ba6805d5cd Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 28 May 2015 20:51:36 -0700 Subject: [PATCH] heimdal: No need to override openldap anymore --- pkgs/top-level/all-packages.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b307a54c85c..8bee00851e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6332,11 +6332,7 @@ let # Modularize heimdal into a library first kerberos = libkrb5; - heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { - openldap = openldap.override { - cyrus_sasl = cyrus_sasl.override { kerberos = null; }; - }; - }; + heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; harfbuzz = callPackage ../development/libraries/harfbuzz { }; harfbuzz-icu = callPackage ../development/libraries/harfbuzz {