diff options
| author | Piotr Bogdan <ppbogdan@gmail.com> | 2018-12-09 02:15:50 +0000 |
|---|---|---|
| committer | Piotr Bogdan <ppbogdan@gmail.com> | 2018-12-09 02:15:50 +0000 |
| commit | ee09eacc3534785db94280e157ee1b87db1f69d0 (patch) | |
| tree | b8bc4b93a45841363f99a99413021a3a8135f801 | |
| parent | 3556990e36bcbde18c547084c581b6edc3cfd614 (diff) | |
| parent | ab984d24b0b84a969387deb0abb94ba6d5674066 (diff) | |
| download | nixlib-ee09eacc3534785db94280e157ee1b87db1f69d0.tar nixlib-ee09eacc3534785db94280e157ee1b87db1f69d0.tar.gz nixlib-ee09eacc3534785db94280e157ee1b87db1f69d0.tar.bz2 nixlib-ee09eacc3534785db94280e157ee1b87db1f69d0.tar.lz nixlib-ee09eacc3534785db94280e157ee1b87db1f69d0.tar.xz nixlib-ee09eacc3534785db94280e157ee1b87db1f69d0.tar.zst nixlib-ee09eacc3534785db94280e157ee1b87db1f69d0.zip | |
cyrus_sasl: merge PR #51651 into master
| -rw-r--r-- | pkgs/development/libraries/cyrus-sasl/default.nix | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 4344923f694e..27a8b7b1119e 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext , pam, fixDarwinDylibNames, autoreconfHook, fetchpatch, enableLdap ? false -, buildPackages }: +, buildPackages, pruneLibtoolFiles }: with stdenv.lib; stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "devdoc" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ autoreconfHook fixDarwinDylibNames ]; + nativeBuildInputs = [ autoreconfHook fixDarwinDylibNames pruneLibtoolFiles ]; buildInputs = [ openssl db gettext kerberos ] ++ lib.optional enableLdap openldap @@ -24,12 +24,7 @@ stdenv.mkDerivation rec { patches = [ ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519 ./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 = [ "--with-openssl=${openssl.dev}" @@ -41,12 +36,6 @@ stdenv.mkDerivation rec { 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 = { homepage = https://www.cyrusimap.org/sasl; description = "Library for adding authentication support to connection-based protocols"; |