heimdal: refactor lib-prefixed packages to multi-output

This commit is contained in:
Alexander V. Nikolaev 2018-04-07 13:09:39 +03:00
parent 83a18e14d9
commit cb1e30f84b
2 changed files with 39 additions and 32 deletions
pkgs
development/libraries/kerberos
top-level

View file

@ -2,16 +2,11 @@
, texinfo, perlPackages
, openldap, libcap_ng, sqlite, openssl, db, libedit, pam
, CoreFoundation, Security, SystemConfiguration
# Extra Args
, type ? ""
}:
let
libOnly = type == "lib";
in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "${type}heimdal-${version}";
name = "heimdal-${version}";
version = "7.5.0";
src = fetchFromGitHub {
@ -21,15 +16,15 @@ stdenv.mkDerivation rec {
sha256 = "1j38wjj4k0q8vx168k3d3k0fwa8j1q5q8f2688nnx1b9qgjd6w1d";
};
outputs = [ "out" "bin" "dev" "man" ];
patches = [ ./heimdal-make-missing-headers.patch ];
nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex ]
++ (with perlPackages; [ JSON ])
++ optional (!libOnly) texinfo;
nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex texinfo ]
++ (with perlPackages; [ JSON ]);
buildInputs = optionals (stdenv.isLinux) [ libcap_ng ]
++ [ db sqlite openssl libedit ]
++ optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ]
++ optionals (!libOnly) [ openldap pam ];
++ [ db sqlite openssl libedit openldap pam]
++ optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ];
## ugly, X should be made an option
configureFlags = [
@ -37,12 +32,14 @@ stdenv.mkDerivation rec {
"--localstatedir=/var"
"--enable-hdb-openldap-module"
"--with-sqlite3=${sqlite.dev}"
"--with-libedit=${libedit}"
# ugly, --with-libedit is not enought, it fall back to bundled libedit
"--with-libedit-include=${libedit.dev}/include"
"--with-libedit-lib=${libedit}/lib"
"--with-openssl=${openssl.dev}"
"--without-x"
"--with-berkeley-db"
"--with-berkeley-db-include=${db.dev}/include"
] ++ optionals (!libOnly) [
"--with-openldap=${openldap.dev}"
] ++ optionals (stdenv.isLinux) [
"--with-capng"
@ -50,24 +47,17 @@ stdenv.mkDerivation rec {
postUnpack = ''
sed -i '/^DEFAULT_INCLUDES/ s,$, -I..,' source/cf/Makefile.am.common
sed -i -e 's/date/date --date="@$SOURCE_DATE_EPOCH"/' source/configure.ac
'';
buildPhase = optionalString libOnly ''
(cd include; make -j $NIX_BUILD_CORES)
(cd lib; make -j $NIX_BUILD_CORES)
(cd tools; make -j $NIX_BUILD_CORES)
(cd include/hcrypto; make -j $NIX_BUILD_CORES)
(cd lib/hcrypto; make -j $NIX_BUILD_CORES)
'';
installPhase = optionalString libOnly ''
(cd include; make -j $NIX_BUILD_CORES install)
(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
preConfigure = ''
configureFlagsArray+=(
"--bindir=$out/bin" # Put binaries to $out, then move them to $bin,
# otherwise we go a cyclic dependecny
"--sbindir=$out/sbin"
"--mandir=$man/share/man"
"--infodir=$man/share/info"
"--includedir=$dev/include")
'';
# We need to build hcrypt for applications like samba
@ -76,14 +66,27 @@ stdenv.mkDerivation rec {
(cd lib/hcrypto; make -j $NIX_BUILD_CORES)
'';
# FIXME: share/info hits $bin, IDK why, but I decide is to minor to block
postInstall = ''
# Install hcrypto
(cd include/hcrypto; make -j $NIX_BUILD_CORES install)
(cd lib/hcrypto; make -j $NIX_BUILD_CORES install)
# Do we need it?
rm $out/bin/su
# Doesn't succeed with --libexec=$out/sbin, so
mv "$out/libexec/"* $out/sbin/
mkdir -p $dev/bin
mkdir -p $bin/{,s}bin
mv "$out/libexec/heimdal/"* $dev/bin/
rmdir $out/libexec/heimdal
mv "$out/libexec/"* $bin/sbin/
rmdir $out/libexec
mkdir -p $dev/bin && mv $out/bin/krb5-config $dev/bin/
# Move remaining binaries to $bin
mv $out/bin/* $bin/bin/
'';
# Issues with hydra

View file

@ -9700,10 +9700,14 @@ with pkgs;
hamlib = callPackage ../development/libraries/hamlib { };
# TODO : Let admin choose.
# We are using mit-krb5 because it is better maintained
kerberos = libkrb5;
heimdal = callPackage ../development/libraries/kerberos/heimdal.nix {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
};
libheimdal = heimdal.override { type = "lib"; };
libheimdal = heimdal;
harfbuzz = callPackage ../development/libraries/harfbuzz { };
harfbuzz-icu = harfbuzz.override {