dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #51769 from pbogdan/cyrus-sasl

Browse Source 
cyrus_sasl: merge PR #51651 into master
This commit is contained in:
Jörg Thalheim 2018-12-09 08:40:02 +00:00 committed by GitHub
commit 9a37ec0d61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/cyrus-sasl/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext { lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext
, pam, fixDarwinDylibNames, autoreconfHook, fetchpatch, enableLdap ? false , pam, fixDarwinDylibNames, autoreconfHook, fetchpatch, enableLdap ? false
, buildPackages }: , buildPackages, pruneLibtoolFiles }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "man" "devdoc" ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ];
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ autoreconfHook fixDarwinDylibNames ]; nativeBuildInputs = [ autoreconfHook fixDarwinDylibNames pruneLibtoolFiles ];
buildInputs = buildInputs =
[ openssl db gettext kerberos ] [ openssl db gettext kerberos ]
++ lib.optional enableLdap openldap ++ lib.optional enableLdap openldap
@ -24,12 +24,7 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519 ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519
./cyrus-sasl-ac-try-run-fix.patch ./cyrus-sasl-ac-try-run-fix.patch
] ++ lib.optional stdenv.isFreeBSD ( ];
fetchurl {
url = "http://www.linuxfromscratch.org/patches/blfs/svn/cyrus-sasl-2.1.26-fixes-3.patch";
sha256 = "1vh4pc2rxxm6yvykx0b7kg09jbcwcxwv5rs6yq2ag3y8p6a9x86w";
}
);
configureFlags = [ configureFlags = [
"--with-openssl=${openssl.dev}" "--with-openssl=${openssl.dev}"
@ -41,12 +36,6 @@ stdenv.mkDerivation rec {
installFlags = lib.optional stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ]; installFlags = lib.optional stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ];
postInstall = ''
for f in $out/lib/*.la $out/lib/sasl2/*.la; do
substituteInPlace $f --replace "${openssl.dev}/lib" "${openssl.out}/lib"
done
'';
meta = { meta = {
homepage = https://www.cyrusimap.org/sasl; homepage = https://www.cyrusimap.org/sasl;
description = "Library for adding authentication support to connection-based protocols"; description = "Library for adding authentication support to connection-based protocols";