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

Revert "heimdal: No need to override openldap anymore"

Browse Source 
This reverts commit 4fa5cc71f2d5c5b8f6b5d71cd321d9ba6805d5cd.
This commit is contained in:
William A. Kennington III 2015-06-06 12:02:18 -07:00
parent d5ac5c00d8
commit 3d92654e13
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View File

@ -6340,7 +6340,11 @@ let
# Modularize heimdal into a library first # Modularize heimdal into a library first
kerberos = libkrb5; kerberos = libkrb5;
heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; heimdal = callPackage ../development/libraries/kerberos/heimdal.nix {
openldap = openldap.override {
cyrus_sasl = cyrus_sasl.override { kerberos = null; };
};
};
harfbuzz = callPackage ../development/libraries/harfbuzz { }; harfbuzz = callPackage ../development/libraries/harfbuzz { };
harfbuzz-icu = callPackage ../development/libraries/harfbuzz { harfbuzz-icu = callPackage ../development/libraries/harfbuzz {