Unverified Commit 892647f3 authored by Leona Maroni's avatar Leona Maroni Committed by GitHub
Browse files

[staging-next] electron_38: fix build with Rust 1.90.0 (#459376)

parents e20213f2 1665d382

pkgs/development/tools/electron/common.nix

+10 −3
Original line number Diff line number Diff line
@@ -82,16 +82,14 @@ in 


  patches =

    base.patches

    # Fix build with Rust 1.89.0

    ++ lib.optionals (lib.versionOlder info.version "38") [

      # Fix build with Rust 1.89.0

      # https://chromium-review.googlesource.com/c/chromium/src/+/6624733

      (fetchpatch {

        name = "Define-rust-no-alloc-shim-is-unstable-v2.patch";

        url = "https://github.com/chromium/chromium/commit/6aae0e2353c857d98980ff677bf304288d7c58de.patch";

        hash = "sha256-Dd38c/0hiH+PbGPJhhEFuW6kUR45A36XZqOVExoxlhM=";

      })

    ]

    ++ lib.optionals (lib.versionOlder info.version "38") [

      # Fix build with LLVM 21+

      # https://chromium-review.googlesource.com/c/chromium/src/+/6633292

      (fetchpatch {
@@ -99,6 +97,15 @@ in 
        url = "https://github.com/chromium/chromium/commit/b0ff8c3b258a8816c05bdebf472dbba719d3c491.patch";

        hash = "sha256-YIWcsCj5w0jUd7D67hsuk0ljTA/IbHwA6db3eK4ggUY=";

      })

    ]

    ++ lib.optionals (lib.versionOlder info.version "39") [

      # Fix build with Rust 1.90.0

      # https://chromium-review.googlesource.com/c/chromium/src/+/6875644

      (fetchpatch {

        name = "Define-rust-alloc-error-handler-should-panic-v2.patch";

        url = "https://github.com/chromium/chromium/commit/23d818d3c7fba4658248f17fd7b8993199242aa9.patch";

        hash = "sha256-JVv36PgU/rr34jrhgCyf4Pp8o5j2T8fD1xBVH1avT48=";

      })

    ];



  npmRoot = "third_party/node";