alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Use libheimdal instead of heimdal

Browse source
This commit is contained in:
William A. Kennington III 2015-05-29 00:46:32 -07:00
parent 1e14f0a055
commit 06c9915ed1
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
, heimdal ? null, zlib ? null, libsodium ? null
, libheimdal ? null, zlib ? null, libsodium ? null
# Crypto Dependencies
, openssl ? null, libgcrypt ? null
@ -19,7 +19,7 @@ let
none = null;
}.${cryptoStr};
optHeimdal = shouldUsePkg heimdal;
optLibheimdal = shouldUsePkg libheimdal;
optZlib = shouldUsePkg zlib;
optLibsodium = shouldUsePkg libsodium;
in
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
'';
cmakeFlags = [
"-DWITH_GSSAPI=${if optHeimdal != null then "ON" else "OFF"}"
"-DWITH_GSSAPI=${if optLibheimdal != 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 = [ optHeimdal optZlib optLibsodium crypto ];
buildInputs = [ optLibheimdal optZlib optLibsodium crypto ];
meta = with stdenv.lib; {
description = "SSH client library";

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

@ -8973,7 +8973,7 @@ let
samba4 = callPackage ../servers/samba/4.x.nix {
python = python2;
kerberos = heimdal;
kerberos = libheimdal;
gnutls = gnutls33;
cups = if stdenv.isDarwin then null else cups;
pam = if stdenv.isDarwin then null else pam;