From 740cd9b5f446cdfb32ea2845c20e5e9a93297197 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 7 Aug 2012 14:45:18 +0200
Subject: [PATCH] LyX: add support for spell checking via enchant.

Also comment on testing of other config options.
---
 pkgs/applications/misc/lyx/default.nix | 15 ++++++++++++---
 pkgs/top-level/all-packages.nix        |  4 +---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index 0d0fbe4a5d6..cb832ed99f5 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -1,6 +1,5 @@
-# I haven't put much effort into this expressions .. so some optional depencencies may be missing - Marc
 { fetchurl, stdenv, texLive, python, makeWrapper, pkgconfig
-, libX11, qt
+, libX11, qt4, enchant #, mythes, boost
 }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +11,17 @@ stdenv.mkDerivation rec {
     sha256 = "137dzmz1z6aqz9mdj8gmmi0k60s9sfn6gy916j175cwzq6hpncb8";
   };
 
-  buildInputs = [texLive qt python makeWrapper pkgconfig ];
+  configureFlags = [
+    #"--without-included-boost"
+    /*  Boost is a huge dependency from which 1.4 MB of libs would be used.
+        Using internal boost stuff only increases executable by around 0.2 MB. */
+    #"--without-included-mythes" # such a small library isn't worth a split package
+  ];
+
+  buildInputs = [
+    texLive qt4 python makeWrapper pkgconfig
+    enchant # mythes boost
+  ];
 
   meta = {
     description = "WYSIWYM frontend for LaTeX, DocBook, etc.";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7054595180f..981b21e37f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7170,9 +7170,7 @@ let
 
   lynx = callPackage ../applications/networking/browsers/lynx { };
 
-  lyx = callPackage ../applications/misc/lyx {
-   qt = qt4;
-  };
+  lyx = callPackage ../applications/misc/lyx { };
 
   makeself = callPackage ../applications/misc/makeself { };