From 86808f2c468703f96179ef788c8a750b47619696 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Mon, 20 Jan 2014 09:27:27 +0100 Subject: Making elinks not use python by default. It fails to start for me, due to a python problem, otherwise. And I don't know why I'd need python, so by now I disable it by default. --- .../applications/networking/browsers/elinks/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 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 f14a3df0b53c..142e5a65df6c 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,8 +1,11 @@ -{ stdenv, fetchurl, python, perl, ncurses, x11, bzip2, zlib, openssl +{ stdenv, fetchurl, perl, ncurses, x11, bzip2, zlib, openssl , spidermonkey, gpm -, enableGuile ? true, guile ? null }: +, enableGuile ? true, guile ? null +, enablePython ? false, python ? null +}: assert enableGuile -> guile != null; +assert enablePython -> python != null; stdenv.mkDerivation rec { name = "elinks-0.12pre6"; @@ -14,16 +17,18 @@ stdenv.mkDerivation rec { patches = [ ./gc-init.patch ]; - buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ] - ++ stdenv.lib.optional enableGuile guile; + buildInputs = [ perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ] + ++ stdenv.lib.optional enableGuile guile + ++ stdenv.lib.optional enablePython python; configureFlags = '' --enable-finger --enable-html-highlight - --with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent + --with-perl --enable-gopher --enable-cgi --enable-bittorrent --with-spidermonkey=${spidermonkey} --enable-nntp --with-openssl=${openssl} - '' + stdenv.lib.optionalString enableGuile " --with-guile"; + '' + stdenv.lib.optionalString enableGuile " --with-guile" + + stdenv.lib.optionalString enablePython " --with-python"; crossAttrs = { propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ]; -- cgit 1.4.1