diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-03 11:55:25 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-10 07:05:41 +0100 |
| commit | 513994da9d7a4fe74afa7e1be4f36fb468833d40 (patch) | |
| tree | ac601244a1f880300eb8dbc50d8892cda02aa026 | |
| parent | 732495017b9ec6e0105c0c31aa20c9b397ef16cb (diff) | |
| download | nixpkgs-513994da9d7a4fe74afa7e1be4f36fb468833d40.tar nixpkgs-513994da9d7a4fe74afa7e1be4f36fb468833d40.tar.gz nixpkgs-513994da9d7a4fe74afa7e1be4f36fb468833d40.tar.bz2 nixpkgs-513994da9d7a4fe74afa7e1be4f36fb468833d40.tar.lz nixpkgs-513994da9d7a4fe74afa7e1be4f36fb468833d40.tar.xz nixpkgs-513994da9d7a4fe74afa7e1be4f36fb468833d40.tar.zst nixpkgs-513994da9d7a4fe74afa7e1be4f36fb468833d40.zip | |
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
| -rw-r--r-- | pkgs/development/libraries/cyrus-sasl/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 71cfc626bac..059b0ab0042 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}" |