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

elinks: Simplify cross, no crossAttrs or crossConfig

Browse Source
This commit is contained in:
John Ericson 2017-09-05 13:11:27 -04:00
parent 0825f30fd2
commit 8babcd4d2b
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,10 @@
{ stdenv, fetchurl, perl, ncurses, xlibsWrapper, bzip2, zlib, openssl { stdenv, fetchurl, ncurses, xlibsWrapper, bzip2, zlib, openssl
, spidermonkey_1_8_5, gpm , gpm
, enableGuile ? false, guile ? null # Incompatible licenses, LGPLv3 - GPLv2 , # Incompatible licenses, LGPLv3 - GPLv2
, enablePython ? false, python ? null enableGuile ? false, guile ? null
, enablePython ? false, python ? null
, enablePerl ? (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null
, enableSpidermonkey ? (stdenv.hostPlatform == stdenv.buildPlatform), spidermonkey_1_8_5 ? null
}: }:
assert enableGuile -> guile != null; assert enableGuile -> guile != null;
@ -17,28 +20,26 @@ stdenv.mkDerivation rec {
patches = [ ./gc-init.patch ]; patches = [ ./gc-init.patch ];
buildInputs = [ perl ncurses xlibsWrapper bzip2 zlib openssl spidermonkey_1_8_5 gpm ] buildInputs = [ ncurses xlibsWrapper bzip2 zlib openssl spidermonkey_1_8_5 gpm ]
++ stdenv.lib.optional enableGuile guile ++ stdenv.lib.optional enableGuile guile
++ stdenv.lib.optional enablePython python; ++ stdenv.lib.optional enablePython python
++ stdenv.lib.optional enablePerl perl
;
configureFlags = configureFlags = [
'' "--enable-finger"
--enable-finger --enable-html-highlight "--enable-html-highlight"
--with-perl --enable-gopher --enable-cgi --enable-bittorrent "--enable-gopher"
--with-spidermonkey=${spidermonkey_1_8_5} "--enable-cgi"
--enable-nntp --with-openssl=${openssl.dev} "--enable-bittorrent"
'' + stdenv.lib.optionalString enableGuile " --with-guile" "--enable-nntp"
+ stdenv.lib.optionalString enablePython " --with-python"; "--with-openssl=${openssl.dev}"
"--with-bzip2=${bzip2.dev}"
crossAttrs = { ] ++ stdenv.lib.optional enableGuile "--with-guile"
propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ]; ++ stdenv.lib.optional enablePython "--with-python"
configureFlags = '' ++ stdenv.lib.optional enablePerl "--with-perl"
--enable-finger --enable-html-highlight ++ stdenv.lib.optional enableSpidermonkey "--with-spidermonkey=${spidermonkey_1_8_5}"
--enable-gopher --enable-cgi --enable-bittorrent --enable-nntp ;
--with-openssl=${openssl.crossDrv}
--with-bzip2=${bzip2.crossDrv}
'';
};
meta = { meta = {
description = "Full-featured text-mode web browser"; description = "Full-featured text-mode web browser";