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

Making elinks not use python by default.

Browse Source 
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.
This commit is contained in:
Lluís Batlle i Rossell
2014-01-20 09:27:27 +01:00
parent 01a2986560
commit 86808f2c46
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/browsers/elinks/default.nix
+11 -6
View File
@@ -1,8 +1,11 @@
{ stdenv, fetchurl, python, perl, ncurses, x11, bzip2, zlib, openssl { stdenv, fetchurl, perl, ncurses, x11, bzip2, zlib, openssl
, spidermonkey, gpm , spidermonkey, gpm
, enableGuile ? true, guile ? null }: , enableGuile ? true, guile ? null
, enablePython ? false, python ? null
}:
assert enableGuile -> guile != null; assert enableGuile -> guile != null;
assert enablePython -> python != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "elinks-0.12pre6"; name = "elinks-0.12pre6";
@@ -14,16 +17,18 @@ stdenv.mkDerivation rec {
patches = [ ./gc-init.patch ]; patches = [ ./gc-init.patch ];
buildInputs = [ python perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ] buildInputs = [ perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ]
++ stdenv.lib.optional enableGuile guile; ++ stdenv.lib.optional enableGuile guile
++ stdenv.lib.optional enablePython python;
configureFlags = configureFlags =
'' ''
--enable-finger --enable-html-highlight --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} --with-spidermonkey=${spidermonkey}
--enable-nntp --with-openssl=${openssl} --enable-nntp --with-openssl=${openssl}
'' + stdenv.lib.optionalString enableGuile " --with-guile"; '' + stdenv.lib.optionalString enableGuile " --with-guile"
+ stdenv.lib.optionalString enablePython " --with-python";
crossAttrs = { crossAttrs = {
propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ]; propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ];