From 8d76cf51bb635e238d6371fc304d701e2dece3d7 Mon Sep 17 00:00:00 2001 From: Lluis Batlle Date: Fri, 15 Mar 2013 11:50:09 +0100 Subject: elinks: allow building without guile Guile doesn't build on armv5tel now (failing an important test), so better if I can disable it for elinks. --- pkgs/applications/networking/browsers/elinks/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/networking/browsers/elinks') diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 9334ff4bd41b..1618042364e8 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,5 +1,8 @@ { stdenv, fetchurl, python, perl, ncurses, x11, bzip2, zlib, openssl -, spidermonkey, guile, gpm }: +, spidermonkey, gpm +, enableGuile ? true, guile ? null }: + +assert enableGuile -> guile != null; stdenv.mkDerivation rec { name = "elinks-0.12pre5"; @@ -11,14 +14,15 @@ stdenv.mkDerivation rec { patches = [ ./gc-init.patch ]; - buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey guile gpm ]; + buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ] + ++ stdenv.lib.optional enableGuile guile; configureFlags = '' - --enable-finger --enable-html-highlight --with-guile + --enable-finger --enable-html-highlight --with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent --enable-nntp --with-openssl=${openssl} - ''; + '' + stdenv.lib.optionalString enableGuile " --with-guile"; crossAttrs = { propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ]; -- cgit 1.4.1