diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-08-18 08:54:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-18 08:54:45 +0200 |
| commit | 295888c622d7a4a6190e6bf6881c07a6d9a5046d (patch) | |
| tree | 73a09e22e84056b270d4e33cd94f935b5a24c724 /pkgs/applications/networking | |
| parent | 316a0e9382a380967852b8d5a5a7efdc86fe1165 (diff) | |
| parent | c68f58d95c0e34d91ff3e4f08464954fd0e9e466 (diff) | |
| download | nixlib-295888c622d7a4a6190e6bf6881c07a6d9a5046d.tar nixlib-295888c622d7a4a6190e6bf6881c07a6d9a5046d.tar.gz nixlib-295888c622d7a4a6190e6bf6881c07a6d9a5046d.tar.bz2 nixlib-295888c622d7a4a6190e6bf6881c07a6d9a5046d.tar.lz nixlib-295888c622d7a4a6190e6bf6881c07a6d9a5046d.tar.xz nixlib-295888c622d7a4a6190e6bf6881c07a6d9a5046d.tar.zst nixlib-295888c622d7a4a6190e6bf6881c07a6d9a5046d.zip | |
Merge pull request #66381 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/browsers/elinks/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index b60454c4a42d..4f4741ce0bdf 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -4,7 +4,7 @@ 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 +, enableSpidermonkey ? (stdenv.hostPlatform == stdenv.buildPlatform), spidermonkey ? null }: assert enableGuile -> guile != null; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./gc-init.patch ]; - buildInputs = [ ncurses xlibsWrapper bzip2 zlib openssl spidermonkey_1_8_5 gpm ] + buildInputs = [ ncurses xlibsWrapper bzip2 zlib openssl spidermonkey gpm ] ++ stdenv.lib.optional enableGuile guile ++ stdenv.lib.optional enablePython python ++ stdenv.lib.optional enablePerl perl @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableGuile "--with-guile" ++ stdenv.lib.optional enablePython "--with-python" ++ stdenv.lib.optional enablePerl "--with-perl" - ++ stdenv.lib.optional enableSpidermonkey "--with-spidermonkey=${spidermonkey_1_8_5}" + ++ stdenv.lib.optional enableSpidermonkey "--with-spidermonkey=${spidermonkey}" ; meta = { |