Revert "heimdal: 1.5.3 -> 2015-05-26"
This reverts commit 1e14f0a055d987ab2beb0fc943b3aab02e9dc7cb.
This commit is contained in:
parent
b073b56325
commit
d5ac5c00d8
@ -1,126 +1,95 @@
|
|||||||
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python, perl, yacc, flex
|
{ stdenv, fetchurl, pkgconfig, flex, yacc
|
||||||
, texinfo ? null, perlPackages
|
|
||||||
|
|
||||||
# Optional Dependencies
|
# Optional Dependencies
|
||||||
, openldap ? null, libcap_ng ? null, sqlite ? null, openssl ? null, db ? null
|
, openldap ? null, libcap_ng ? null, sqlite ? null, openssl ? null, db ? null
|
||||||
, readline ? null, libedit ? null, pam ? null
|
, readline ? null, libedit ? null, pam ? null
|
||||||
|
|
||||||
# Extra Args
|
#, readline, openldap, libcap_ng
|
||||||
, prefix ? ""
|
#, sqlite, db, ncurses, openssl, cyrus_sasl
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with stdenv;
|
with stdenv;
|
||||||
|
with stdenv.lib;
|
||||||
let
|
let
|
||||||
libOnly = prefix == "lib";
|
optOpenldap = shouldUsePkg openldap;
|
||||||
|
|
||||||
optTexinfo = if libOnly then null else shouldUsePkg texinfo;
|
|
||||||
optOpenldap = if libOnly then null else shouldUsePkg openldap;
|
|
||||||
optLibcap_ng = shouldUsePkg libcap_ng;
|
optLibcap_ng = shouldUsePkg libcap_ng;
|
||||||
optSqlite = shouldUsePkg sqlite;
|
optSqlite = shouldUsePkg sqlite;
|
||||||
optOpenssl = shouldUsePkg openssl;
|
optOpenssl = shouldUsePkg openssl;
|
||||||
optDb = shouldUsePkg db;
|
optDb = shouldUsePkg db;
|
||||||
optReadline = shouldUsePkg readline;
|
optReadline = shouldUsePkg readline;
|
||||||
optLibedit = shouldUsePkg libedit;
|
optLibedit = shouldUsePkg libedit;
|
||||||
optPam = if libOnly then null else shouldUsePkg pam;
|
optPam = shouldUsePkg pam;
|
||||||
|
|
||||||
lineParserStr = if optLibedit != null then "libedit"
|
|
||||||
else if optReadline != null then "readline"
|
|
||||||
else "no";
|
|
||||||
|
|
||||||
lineParserInputs = {
|
|
||||||
"libedit" = [ optLibedit ];
|
|
||||||
"readline" = [ optReadline ];
|
|
||||||
"no" = [ ];
|
|
||||||
}.${lineParserStr};
|
|
||||||
in
|
in
|
||||||
with stdenv.lib;
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "${prefix}heimdal-${version}";
|
name = "heimdal-1.5.3";
|
||||||
version = "2015-05-26";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchurl {
|
||||||
owner = "heimdal";
|
urls = [
|
||||||
repo = "heimdal";
|
"http://www.h5l.org/dist/src/${name}.tar.gz"
|
||||||
rev = "50e2a5ce95f42d4963d359c27a832e61991a12b1";
|
"http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz"
|
||||||
sha256 = "10104vm192r1i7ccs1fan16h9n31saaswsmywmrb0cxc7jv3rj8x";
|
];
|
||||||
|
sha256 = "19gypf9vzfrs2bw231qljfl4cqc1riyg0ai0xmm1nd1wngnpphma";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook pkgconfig python perl yacc flex optTexinfo ]
|
nativeBuildInputs = [ pkgconfig flex yacc ];
|
||||||
++ (with perlPackages; [ JSON ]);
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
optOpenldap optLibcap_ng optSqlite optOpenssl optDb optPam
|
optOpenldap optLibcap_ng optSqlite optOpenssl optDb optReadline optLibedit
|
||||||
] ++ lineParserInputs;
|
optPam
|
||||||
|
|
||||||
configureFlags = [
|
|
||||||
(mkOther "sysconfdir" "/etc")
|
|
||||||
(mkOther "localstatedir" "/var")
|
|
||||||
(mkWith (optOpenldap != null) "openldap" optOpenldap)
|
|
||||||
(mkEnable (optOpenldap != null) "hdb-openldap-module" null)
|
|
||||||
(mkEnable true "pk-init" null)
|
|
||||||
(mkEnable true "digest" null)
|
|
||||||
(mkEnable true "kx509" null)
|
|
||||||
(mkWith (optLibcap_ng != null) "capng" null)
|
|
||||||
(mkWith (optSqlite != null) "sqlite3" sqlite)
|
|
||||||
(mkEnable (optSqlite != null) "sqlite-cache" null)
|
|
||||||
(mkWith false "libintl" null) # TODO libintl fix
|
|
||||||
(mkWith true "hdbdir" "/var/lib/heimdal")
|
|
||||||
(mkEnable false "dce" null) # TODO: Add support
|
|
||||||
(mkEnable (!libOnly) "afs-support" null)
|
|
||||||
(mkEnable true "mmap" null)
|
|
||||||
(mkEnable (!libOnly) "afs-string-to-key" null)
|
|
||||||
(mkWith (lineParserStr == "readline") "readline" optReadline)
|
|
||||||
(mkWith (lineParserStr == "libedit") "libedit" optLibedit)
|
|
||||||
(mkWith false "hesiod" null)
|
|
||||||
(mkEnable (!libOnly) "kcm" null)
|
|
||||||
(mkEnable (optTexinfo != null) "heimdal-documentation" null)
|
|
||||||
(mkWith true "ipv6" null)
|
|
||||||
(mkEnable true "pthread-support" null)
|
|
||||||
(mkEnable false "osfc2" null)
|
|
||||||
(mkEnable false "socket-wrapper" null)
|
|
||||||
(mkEnable (!libOnly) "otp" null)
|
|
||||||
(mkEnable false "developer" null)
|
|
||||||
(mkWith (optDb != null) "berkeley-db" optDb)
|
|
||||||
(mkEnable true "ndbm-db" null)
|
|
||||||
(mkEnable false "mdb-db" null)
|
|
||||||
(mkWith (optOpenssl != null) "openssl" optOpenssl)
|
|
||||||
];
|
];
|
||||||
|
|
||||||
buildPhase = optionalString libOnly ''
|
configureFlags = [
|
||||||
(cd include; make -j $NIX_BUILD_CORES)
|
(mkOther "sysconfdir" "/etc")
|
||||||
(cd lib; make -j $NIX_BUILD_CORES)
|
(mkOther "localstatedir" "/var")
|
||||||
(cd tools; make -j $NIX_BUILD_CORES)
|
(mkWith (optOpenldap != null) "openldap" optOpenldap)
|
||||||
(cd include/hcrypto; make -j $NIX_BUILD_CORES)
|
(mkEnable (optOpenldap != null) "hdb-openldap-module" null)
|
||||||
(cd lib/hcrypto; make -j $NIX_BUILD_CORES)
|
(mkEnable true "pk-init" null)
|
||||||
'';
|
(mkEnable true "digest" null)
|
||||||
|
(mkEnable true "kx509" null)
|
||||||
|
(mkWith (optLibcap_ng != null) "capng" null)
|
||||||
|
(mkWith (optSqlite != null) "sqlite3" sqlite)
|
||||||
|
(mkEnable (optSqlite != null) "sqlite-cache" null)
|
||||||
|
(mkWith false "libintl" null) # TODO libintl fix
|
||||||
|
(mkWith true "hdbdir" "/var/lib/heimdal")
|
||||||
|
(mkWith (optOpenssl != null) "openssl" optOpenssl)
|
||||||
|
(mkEnable true "pthread-support" null)
|
||||||
|
(mkEnable false "dce" null) # TODO: Add support
|
||||||
|
(mkEnable true "afs-support" null)
|
||||||
|
(mkWith (optDb != null) "berkeley-db" optDb)
|
||||||
|
(mkEnable false "nmdb" null)
|
||||||
|
(mkEnable false "developer" null)
|
||||||
|
(mkWith true "ipv6" null)
|
||||||
|
(mkEnable false "socket-wrapper" null)
|
||||||
|
(mkEnable true "otp" null)
|
||||||
|
(mkEnable false "osfc2" null)
|
||||||
|
(mkEnable true "mmap" null)
|
||||||
|
(mkEnable true "afs-string-to-key" null)
|
||||||
|
(mkWith (optReadline != null) "readline" optReadline)
|
||||||
|
(mkWith (optLibedit != null) "libedit" optLibedit)
|
||||||
|
(mkWith false "x" null)
|
||||||
|
(mkEnable true "kcm" null)
|
||||||
|
(mkEnable true "heimdal-documentation" null)
|
||||||
|
];
|
||||||
|
|
||||||
installPhase = optionalString libOnly ''
|
preConfigure = ''
|
||||||
(cd include; make -j $NIX_BUILD_CORES install)
|
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -pthread"
|
||||||
(cd lib; make -j $NIX_BUILD_CORES install)
|
|
||||||
(cd tools; make -j $NIX_BUILD_CORES install)
|
|
||||||
(cd include/hcrypto; make -j $NIX_BUILD_CORES install)
|
|
||||||
(cd lib/hcrypto; make -j $NIX_BUILD_CORES install)
|
|
||||||
rm -rf $out/{libexec,sbin,share}
|
|
||||||
find $out/bin -type f | grep -v 'krb5-config' | xargs rm
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# We need to build hcrypt for applications like samba
|
# We need to build hcrypt for applications like samba
|
||||||
postBuild = ''
|
postBuild = ''
|
||||||
(cd include/hcrypto; make -j $NIX_BUILD_CORES)
|
(cd lib/hcrypto; make)
|
||||||
(cd lib/hcrypto; make -j $NIX_BUILD_CORES)
|
(cd include/hcrypto; make)
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
# Install hcrypto
|
# Install hcrypto
|
||||||
(cd include/hcrypto; make -j $NIX_BUILD_CORES install)
|
(cd lib/hcrypto; make install)
|
||||||
(cd lib/hcrypto; make -j $NIX_BUILD_CORES install)
|
(cd include/hcrypto; make install)
|
||||||
|
|
||||||
# Doesn't succeed with --libexec=$out/sbin, so
|
# Doesn't succeed with --libexec=$out/sbin, so
|
||||||
mv "$out/libexec/"* $out/sbin/
|
mv "$out/libexec/"* $out/sbin/
|
||||||
rmdir $out/libexec
|
rmdir $out/libexec
|
||||||
'';
|
'';
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "an implementation of Kerberos 5 (and some more stuff) largely written in Sweden";
|
description = "an implementation of Kerberos 5 (and some more stuff) largely written in Sweden";
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
|
@ -6341,9 +6341,6 @@ let
|
|||||||
kerberos = libkrb5;
|
kerberos = libkrb5;
|
||||||
|
|
||||||
heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
|
heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
|
||||||
libheimdal = heimdal.override {
|
|
||||||
prefix = "lib";
|
|
||||||
};
|
|
||||||
|
|
||||||
harfbuzz = callPackage ../development/libraries/harfbuzz { };
|
harfbuzz = callPackage ../development/libraries/harfbuzz { };
|
||||||
harfbuzz-icu = callPackage ../development/libraries/harfbuzz {
|
harfbuzz-icu = callPackage ../development/libraries/harfbuzz {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user