JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pidgin: reenable spellcheck and voice/video in linux builds

Browse Source 
Signed-off-by: Frederick F. Kautz IV <fkautz@alumni.cmu.edu>
This commit is contained in:
Frederick F. Kautz IV 2020-06-30 13:24:51 -07:00
parent 19211e9a6a
commit f25079d967
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/networking/instant-messengers/pidgin/default.nix
View File

@ -40,9 +40,7 @@ let unwrapped = stdenv.mkDerivation rec {
++ (lib.optional (openssl != null) openssl) ++ (lib.optional (openssl != null) openssl)
++ (lib.optional (gnutls != null) gnutls) ++ (lib.optional (gnutls != null) gnutls)
++ (lib.optional (libgcrypt != null) libgcrypt) ++ (lib.optional (libgcrypt != null) libgcrypt)
++ (lib.optional (stdenv.isLinux) gtk2) ++ (lib.optionals (stdenv.isLinux) [gtk2 gtkspell2 farstream])
++ (lib.optional (stdenv.isLinux) gtkspell2)
++ (lib.optional (stdenv.isLinux) farstream)
++ (lib.optional (stdenv.isDarwin) gtk2-x11); ++ (lib.optional (stdenv.isDarwin) gtk2-x11);
@ -62,11 +60,10 @@ let unwrapped = stdenv.mkDerivation rec {
"--disable-meanwhile" "--disable-meanwhile"
"--disable-nm" "--disable-nm"
"--disable-tcl" "--disable-tcl"
"--disable-gtkspell"
"--disable-vv"
] ]
++ (lib.optionals (cyrus_sasl != null) [ "--enable-cyrus-sasl=yes" ]) ++ (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; enableParallelBuilding = true;