From 0aaadc2b9e87e77c6de2ec38e5de1bb7aa914496 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 12 Oct 2015 20:04:24 +0300 Subject: [PATCH] gajim: drop LaTeX support It's in a separate plugin now. --- .../networking/instant-messengers/gajim/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 69497f87c6b2..2045dcdeca43 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -7,7 +7,6 @@ , enableRST ? true , enableSpelling ? true, gtkspell ? null , enableNotifications ? false -, enableLaTeX ? false, texLive ? null }: assert enableJingle -> farstream != null && gst_plugins_bad != null @@ -16,7 +15,6 @@ assert enableE2E -> pythonPackages.pycrypto != null; assert enableRST -> pythonPackages.docutils != null; assert enableSpelling -> gtkspell != null; assert enableNotifications -> pythonPackages.notify != null; -assert enableLaTeX -> texLive != null; with stdenv.lib; @@ -51,11 +49,6 @@ stdenv.mkDerivation rec { '' + optionalString enableSpelling '' sed -i -e 's|=.*find_lib.*|= "${gtkspell}/lib/libgtkspell.so"|' \ src/gtkspell.py - '' + optionalString enableLaTeX '' - sed -i -e "s|try_run(.'dvipng'|try_run(['${texLive}/bin/dvipng'|" \ - -e "s|try_run(.'latex'|try_run(['${texLive}/bin/latex'|" \ - -e 's/tmpfd.close()/os.close(tmpfd)/' \ - src/common/latex.py ''; buildInputs = [ @@ -68,8 +61,7 @@ stdenv.mkDerivation rec { ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ] ++ optional enableE2E pythonPackages.pycrypto ++ optional enableRST pythonPackages.docutils - ++ optional enableNotifications pythonPackages.notify - ++ optional enableLaTeX texLive; + ++ optional enableNotifications pythonPackages.notify; postInstall = '' install -m 644 -t "$out/share/gajim/icons/hicolor" \