cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

spidermonkey_60: init at 60.3.0

Browse source 
A new test checks and fails if we're building in js/src, so we create a build
dir like Arch does.
This commit is contained in:
Tor Hedin Brønner 2018-09-06 08:02:16 +02:00 committed by Jan Tojnar
parent bd2c80a42e
commit e09e735a09
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
3 changed files with 59 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/gnome-3/core/gjs/default.nix
View file

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, atk, gobjectIntrospection
, spidermonkey_52, pango, readline, glib, libxml2, dbus, gdk_pixbuf
, spidermonkey_60, pango, readline, glib, libxml2, dbus, gdk_pixbuf
, makeWrapper }:
stdenv.mkDerivation rec {
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ libxml2 gobjectIntrospection gtk3 glib pango readline dbus ];
propagatedBuildInputs = [ spidermonkey_52 ];
propagatedBuildInputs = [ spidermonkey_60 ];
configureFlags = [
"--enable-installed-tests"

56
pkgs/development/interpreters/spidermonkey/60.nix Normal file
View file

@ -0,0 +1,56 @@
{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }:
let
version = "60.3.0";
in stdenv.mkDerivation rec {
name = "spidermonkey-${version}";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
sha256 = "0qak5gmkx8xm88xgnxdmj4z7sivbbvmg2v029fp9q5ms38cg6rjm";
};
buildInputs = [ readline icu zlib nspr ];
nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ];
patches = [
(fetchpatch {
url = https://bug1415202.bmoattachments.org/attachment.cgi?id=8926363;
sha256 = "082ryrvqa3lvs67v3sq9kf2jshf4qp1fpi195wffc40jdrl8fnin";
})
];
preConfigure = ''
export CXXFLAGS="-fpermissive"
export LIBXUL_DIST=$out
export PYTHON="${python2.interpreter}"
# We can't build in js/src/, so create a build dir
mkdir obj
cd obj/
configureScript=../js/src/configure
'';
# We need the flags specified here for gjs:
# https://gitlab.gnome.org/GNOME/gnome-sdk-images/blob/bc8829439a4f1019d0c56a293ddd84e936fdf9f9/org.gnome.Sdk.json.in#L744
configureFlags = [
"--with-system-zlib"
"--with-system-icu"
"--with-intl-api"
"--enable-readline"
"--enable-shared-js"
"--enable-posix-nspr-emulation"
"--disable-jemalloc"
"--enable-release"
];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Mozilla's JavaScript engine written in C/C++";
homepage = https://developer.mozilla.org/en/SpiderMonkey;
license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
maintainers = [ maintainers.abbradar ];
platforms = platforms.linux;
};
}

1
pkgs/top-level/all-packages.nix
View file

@ -7993,6 +7993,7 @@ with pkgs;
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
}));
spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { };
spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { };
spidermonkey = spidermonkey_31;
ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { };