diff options
| author | Kirill A. Korinsky <kirill@korins.ky> | 2022-07-04 20:41:57 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-08-10 23:33:20 +0200 |
| commit | c053cde6be396e8c5897ac7ed9c4fb2b21a79874 (patch) | |
| tree | 5ad358397d3fc43f09331da22dac828f48ecd666 /pkgs/development/interpreters/spidermonkey | |
| parent | 457b124ad2eac9fb6d7030f7d9bb3fe7d332ed1b (diff) | |
spidermonkey_102: init at 102.1.0
Diffstat (limited to 'pkgs/development/interpreters/spidermonkey')
| -rw-r--r-- | pkgs/development/interpreters/spidermonkey/102.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/spidermonkey/common.nix | 15 |
2 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/spidermonkey/102.nix b/pkgs/development/interpreters/spidermonkey/102.nix new file mode 100644 index 0000000000000..ef89d1ca0a276 --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/102.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "102.1.0"; + hash = "sha512-JQW4fOQRVEVWjra32K9BZ4vXh/0H8/eenwoi2QzfdSrl1DcYVs+cVuLZ2n1bfDk53CqrV1P8wBc5jn1lJg9vAw=="; +} diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index 69dc637b23407..e544ef4732c22 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -56,6 +56,19 @@ stdenv.mkDerivation (finalAttrs: rec { # - https://hg.mozilla.org/mozilla-central/rev/ec48f15d085c # - https://hg.mozilla.org/mozilla-central/rev/6803dda74d33 ./add-riscv64-support.patch + ] ++ lib.optionals (lib.versionAtLeast version "102") [ + # Patches required by GJS + # https://discourse.gnome.org/t/gnome-43-to-depend-on-spidermonkey-102/10658 + # Install ProfilingCategoryList.h + (fetchpatch { + url = "https://hg.mozilla.org/releases/mozilla-esr102/raw-rev/33147b91e42b79f4c6dd3ec11cce96746018407a"; + sha256 = "sha256-xJFJZMYJ6P11HQDZbr48GFgybpAeVcu3oLIFEyyMjBI="; + }) + # Fix embeder build + (fetchpatch { + url = "https://hg.mozilla.org/releases/mozilla-esr102/raw-rev/1fa20fb474f5d149cc32d98df169dee5e6e6861b"; + sha256 = "sha256-eCisKjNxy9SLr9KoEE2UB26BflUknnR7PIvnpezsZeA="; + }) ]; nativeBuildInputs = [ @@ -123,7 +136,7 @@ stdenv.mkDerivation (finalAttrs: rec { # while we have a double-float toolchain NIX_CFLAGS_COMPILE = lib.optionalString (with stdenv.hostPlatform; isRiscV && is64bit && lib.versionOlder version "91") "-mabi=lp64d"; - postPatch = '' + postPatch = lib.optionalString (lib.versionOlder version "102") '' # This patch is a manually applied fix of # https://bugzilla.mozilla.org/show_bug.cgi?id=1644600 # Once that bug is fixed, this can be removed. |