ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 12:53:59 +03:00
Code Issues Projects Releases Wiki Activity

Revert "Use libheimdal instead of heimdal"

Browse Source 
This reverts commit 06c9915ed1.
This commit is contained in:
William A. Kennington III 2015-06-06 12:01:59 -07:00
parent cfd831a40a
commit b073b56325
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/libssh/default.nix
View File

@ -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";

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

@ -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;