about summary refs log tree commit diff
path: root/pkgs/development/interpreters/spidermonkey
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-06-16 18:28:22 +0200
committerGitHub <noreply@github.com>2021-06-16 18:28:22 +0200
commitf19e197e43b9aa7e17a2671936f95d732ddc4695 (patch)
tree8dc1e05995d8364b0fe279e10f306ddec624a1e2 /pkgs/development/interpreters/spidermonkey
parent1937db231cd3cfa12557c2f864183747da59a225 (diff)
parent1b1e681d77dc0452c4b557aa6e10f2e02e0650ca (diff)
Merge pull request #114942 from lopsided98/spidermonkey-arm
spidermonkey_78: fix build on armv7l
Diffstat (limited to 'pkgs/development/interpreters/spidermonkey')
-rw-r--r--pkgs/development/interpreters/spidermonkey/78.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix
index c1cc53ea6c6a7..9b81dcc55e7f7 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