Merge pull request #264204 from devusb/spidermonkey

spidermonkey_91: fix build with python311
2023-11-07 19:32:04 +01:00
parent 03e7a22654 ecbdec62a3
commit 6f2583545f
1 changed files with 6 additions and 0 deletions
@@ -65,6 +65,12 @@ stdenv.mkDerivation (finalAttrs: rec {
  ] ++ lib.optionals (lib.versionAtLeast version "91" && stdenv.hostPlatform.system == "i686-linux") [
    # Fixes i686 build, https://bugzilla.mozilla.org/show_bug.cgi?id=1729459
    ./fix-float-i686.patch
+  ] ++ lib.optionals (lib.versionAtLeast version "91" && lib.versionOlder version "102") [
+    # Fix 91 compatibility with python311
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/mozjs91/raw/rawhide/f/0001-Python-Build-Use-r-instead-of-rU-file-read-modes.patch";
+      hash = "sha256-WgDIBidB9XNQ/+HacK7jxWnjOF8PEUt5eB0+Aubtl48=";
+    })
  ];

  nativeBuildInputs = [