From 513994da9d7a4fe74afa7e1be4f36fb468833d40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 3 Jan 2016 11:55:25 +0100
Subject: [PATCH] cyrus-sasl: only apply patch on FreeBSD to fix #12279
I noticed the breakage but forgot this patch in another branch.
https://github.com/NixOS/nixpkgs/pull/10816#issuecomment-168486249
---
pkgs/development/libraries/cyrus-sasl/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 71cfc626bac1..059b0ab0042a 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -10,19 +10,19 @@ stdenv.mkDerivation rec {
};
buildInputs =
- [ openssl db gettext kerberos autoreconfHook ]
+ [ openssl db gettext kerberos ]
+ ++ lib.optional stdenv.isFreeBSD autoreconfHook
++ lib.optional stdenv.isLinux pam
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
patches = [
./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519
- (
+ ] ++ 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}"