From b073b563251fc6fc0d055812f049621801808313 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 6 Jun 2015 12:01:59 -0700
Subject: [PATCH] Revert "Use libheimdal instead of heimdal"

This reverts commit 06c9915ed1db6ab505b869d240f75a6d53f2fcc9.
---
 pkgs/development/libraries/libssh/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index a9117556a7f4..8ea2ac72da0b 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, cmake
 
 # Optional Dependencies
-, libheimdal ? null, zlib ? null, libsodium ? null
+, heimdal ? null, zlib ? null, libsodium ? null
 
 # Crypto Dependencies
 , openssl ? null, libgcrypt ? null
@@ -19,7 +19,7 @@ let
     none = null;
   }.${cryptoStr};
 
-  optLibheimdal = shouldUsePkg libheimdal;
+  optHeimdal = shouldUsePkg heimdal;
   optZlib = shouldUsePkg zlib;
   optLibsodium = shouldUsePkg libsodium;
 in
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   '';
 
   cmakeFlags = [
-    "-DWITH_GSSAPI=${if optLibheimdal != null then "ON" else "OFF"}"
+    "-DWITH_GSSAPI=${if optHeimdal != null then "ON" else "OFF"}"
     "-DWITH_ZLIB=${if optZlib != null then "ON" else "OFF"}"
     "-DWITH_SSH1=OFF"
     "-DWITH_SFTP=ON"
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ pkgconfig cmake ];
-  buildInputs = [ optLibheimdal optZlib optLibsodium crypto ];
+  buildInputs = [ optHeimdal optZlib optLibsodium crypto ];
 
   meta = with stdenv.lib; {
     description = "SSH client library";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8aac40f07237..af5d0f586d11 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8981,7 +8981,7 @@ let
 
   samba4 = callPackage ../servers/samba/4.x.nix {
     python = python2;
-    kerberos = libheimdal;
+    kerberos = heimdal;
     gnutls = gnutls33;
     cups = if stdenv.isDarwin then null else cups;
     pam = if stdenv.isDarwin then null else pam;