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

elinks: allow building without guile

Browse Source 
Guile doesn't build on armv5tel now (failing an important test),
so better if I can disable it for elinks.
This commit is contained in:
Lluis Batlle 2013-03-15 11:50:09 +01:00
parent 6922ec9258
commit 8d76cf51bb
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/browsers/elinks/default.nix
View File

@ -1,5 +1,8 @@
{ stdenv, fetchurl, python, perl, ncurses, x11, bzip2, zlib, openssl { 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 { stdenv.mkDerivation rec {
name = "elinks-0.12pre5"; name = "elinks-0.12pre5";
@ -11,14 +14,15 @@ stdenv.mkDerivation rec {
patches = [ ./gc-init.patch ]; 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 = configureFlags =
'' ''
--enable-finger --enable-html-highlight --with-guile --enable-finger --enable-html-highlight
--with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent --with-perl --with-python --enable-gopher --enable-cgi --enable-bittorrent
--enable-nntp --with-openssl=${openssl} --enable-nntp --with-openssl=${openssl}
''; '' + stdenv.lib.optionalString enableGuile " --with-guile";
crossAttrs = { crossAttrs = {
propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ]; propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ];