Unverified Commit c19b25f8 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge staging-next into staging

parents 82b0c164 f02a4ace

pkgs/by-name/br/brunsli/package.nix

+5 −0
Original line number Diff line number Diff line
@@ -42,6 +42,11 @@ stdenv.mkDerivation rec { 
  ''

  + lib.optionalString stdenv.hostPlatform.isDarwin ''

    rm -r build

  ''

  # fix build with cmake v4, should be removed in next release

  + ''

    substituteInPlace CMakeLists.txt \

      --replace-fail 'cmake_minimum_required(VERSION 3.1)' 'cmake_minimum_required(VERSION 3.10)'

  '';



  nativeBuildInputs = [

pkgs/development/tools/electron/common.nix

+9 −0
Original line number Diff line number Diff line
@@ -140,6 +140,15 @@ in 
        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 {

        name = "Dont-return-an-enum-from-EnumSizeTraits-Count.patch";

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

        hash = "sha256-YIWcsCj5w0jUd7D67hsuk0ljTA/IbHwA6db3eK4ggUY=";

      })

    ];



  npmRoot = "third_party/node";