From 9b1ef47ae371a393771eb4c457ef406d0dfb42e2 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 27 Feb 2021 12:23:37 -0500 Subject: [PATCH] spidermonkey_78: fix build on armv7l Adds a patch from Debian to fix a build failure on armv7l. (cherry picked from commit 1b1e681d77dc0452c4b557aa6e10f2e02e0650ca) --- pkgs/development/interpreters/spidermonkey/78.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix index c1cc53ea6c6..9b81dcc55e7 100644 --- a/pkgs/development/interpreters/spidermonkey/78.nix +++ b/pkgs/development/interpreters/spidermonkey/78.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl +, fetchpatch , autoconf213 , pkg-config , perl @@ -27,6 +28,15 @@ stdenv.mkDerivation rec { sha256 = "0zjpzkxx3wc2840d7q4b9lnkj1kwk1qps29s9c83jf5y6xclnf9q"; }; + patches = [ + # Fix build failure on armv7l using Debian patch + # Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1526653 + (fetchpatch { + url = "https://salsa.debian.org/mozilla-team/firefox/commit/fd6847c9416f9eebde636e21d794d25d1be8791d.patch"; + sha256 = "02b7zwm6vxmk61aj79a6m32s1k5sr0hwm3q1j4v6np9jfyd10g1j"; + }) + ]; + outputs = [ "out" "dev" ]; setOutputFlags = false; # Configure script only understands --includedir