spidermonkey: cleanup and rename versions
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, perl, ncurses, xlibsWrapper, bzip2, zlib, openssl
|
||||
, spidermonkey, gpm
|
||||
, spidermonkey_1_8_5, gpm
|
||||
, enableGuile ? false, guile ? null # Incompatible licenses, LGPLv3 - GPLv2
|
||||
, enablePython ? false, python ? null
|
||||
}:
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [ ./gc-init.patch ];
|
||||
|
||||
buildInputs = [ perl ncurses xlibsWrapper bzip2 zlib openssl spidermonkey gpm ]
|
||||
buildInputs = [ perl ncurses xlibsWrapper bzip2 zlib openssl spidermonkey_1_8_5 gpm ]
|
||||
++ stdenv.lib.optional enableGuile guile
|
||||
++ stdenv.lib.optional enablePython python;
|
||||
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
''
|
||||
--enable-finger --enable-html-highlight
|
||||
--with-perl --enable-gopher --enable-cgi --enable-bittorrent
|
||||
--with-spidermonkey=${spidermonkey}
|
||||
--with-spidermonkey=${spidermonkey_1_8_5}
|
||||
--enable-nntp --with-openssl=${openssl.dev}
|
||||
'' + stdenv.lib.optionalString enableGuile " --with-guile"
|
||||
+ stdenv.lib.optionalString enablePython " --with-python";
|
||||
|
||||
Reference in New Issue
Block a user