From f25079d967bc7a7a8181637cfdb154c39460d3ec Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Tue, 30 Jun 2020 13:24:51 -0700 Subject: [PATCH] pidgin: reenable spellcheck and voice/video in linux builds Signed-off-by: Frederick F. Kautz IV --- .../networking/instant-messengers/pidgin/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index eec4b1e1899..a269eead708 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -40,9 +40,7 @@ let unwrapped = stdenv.mkDerivation rec { ++ (lib.optional (openssl != null) openssl) ++ (lib.optional (gnutls != null) gnutls) ++ (lib.optional (libgcrypt != null) libgcrypt) - ++ (lib.optional (stdenv.isLinux) gtk2) - ++ (lib.optional (stdenv.isLinux) gtkspell2) - ++ (lib.optional (stdenv.isLinux) farstream) + ++ (lib.optionals (stdenv.isLinux) [gtk2 gtkspell2 farstream]) ++ (lib.optional (stdenv.isDarwin) gtk2-x11); @@ -62,11 +60,10 @@ let unwrapped = stdenv.mkDerivation rec { "--disable-meanwhile" "--disable-nm" "--disable-tcl" - "--disable-gtkspell" - "--disable-vv" ] ++ (lib.optionals (cyrus_sasl != null) [ "--enable-cyrus-sasl=yes" ]) - ++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]); + ++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]) + ++ (lib.optionals (stdenv.isDarwin) ["--disable-gtkspell" "--disable-vv"]); enableParallelBuilding = true;