From a00c862e97562b4fbc7024561a999d01a1feb1bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Fri, 7 Dec 2018 07:37:25 +0100 Subject: [PATCH 1/3] cyrus_sasl: prune .la files Version 2.1.27 adds `-lkrb5` etc. to `dependency_libs` in all the .la files, which in turn breaks spice's build. Prune .la's dependency_libs with pruneLibtoolFiles. --- pkgs/development/libraries/cyrus-sasl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 4344923f694e..20a34adca94a 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 From f92943932de7ff2e7de41b693ad4001900910cbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 7 Dec 2018 10:23:55 +0000 Subject: [PATCH 2/3] cyrus-sasl: remove non-existing freebsd patch --- pkgs/development/libraries/cyrus-sasl/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 20a34adca94a..5d84e12cc25f 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -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}" From ab984d24b0b84a969387deb0abb94ba6d5674066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 8 Dec 2018 17:10:09 +0000 Subject: [PATCH 3/3] cyrus-sasl: remove not-needed libtool fixup since pruneLibtoolFiles is used openssl is no longer referenced --- pkgs/development/libraries/cyrus-sasl/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 5d84e12cc25f..27a8b7b1119e 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -36,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";