Unverified Commit 9d38a5de authored by Emily's avatar Emily Committed by GitHub
Browse files

Merge pull request #304768 from emilylange/chromium 

chromium: 123.0.6312.122 -> 124.0.6367.60, fix M124+ build by using the vendored libwebp
parents d9ec9a35 fb10ea41

pkgs/applications/networking/browsers/chromium/common.nix

+16 −0
Original line number Diff line number Diff line
@@ -102,7 +102,14 @@ let 
    "flac"

    "libjpeg"

    "libpng"

  ] ++ lib.optionals (!chromiumVersionAtLeast "124") [

    # Use the vendored libwebp for M124+ until we figure out how to solve:

    # Running phase: configurePhase

    # ERROR Unresolved dependencies.

    # //third_party/libavif:libavif_enc(//build/toolchain/linux/unbundle:default)

    #   needs //third_party/libwebp:libwebp_sharpyuv(//build/toolchain/linux/unbundle:default)

    "libwebp"

  ] ++ [

    "libxslt"

    # "opus"

  ];
@@ -241,6 +248,15 @@ let 
      # Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61

      # allowing us to use our rustc and our clang.

      ./patches/chromium-121-rust.patch

    ] ++ lib.optionals (chromiumVersionAtLeast "124" && !chromiumVersionAtLeast "125") [

      # M124 shipped with broken --ozone-platform-hint flag handling, which we rely on

      # for our NIXOS_OZONE_WL (wayland) environment variable.

      # See <https://issues.chromium.org/issues/329678163>.

      # This is the commit for the fix that landed in M125, which applies clean on M124.

      (githubPatch {

        commit = "c7f4c58f896a651eba80ad805ebdb49d19ebdbd4";

        hash = "sha256-6nYWT2zN+j73xAIXLdGYT2eC71vGnGfiLCB0OwT0CAI=";

      })

    ];



    postPatch = ''

pkgs/applications/networking/browsers/chromium/upstream-info.nix

+6 −6
Original line number Diff line number Diff line
@@ -9,15 +9,15 @@ 
    };

    deps = {

      gn = {

        hash = "sha256-JvilCnnb4laqwq69fay+IdAujYC1EHD7uWpkF/C8tBw=";

        rev = "d4f94f9a6c25497b2ce0356bb99a8d202c8c1d32";

        hash = "sha256-aEL1kIhgPAFqdb174dG093HoLhCJ07O1Kpqfu7r14wQ=";

        rev = "22581fb46c0c0c9530caa67149ee4dd8811063cf";

        url = "https://gn.googlesource.com/gn";

        version = "2024-02-19";

        version = "2024-03-14";

      };

    };

    hash = "sha256-7H7h621AHPyhFYbaVFO892TtS+SP3Qu7cYUVk3ICL14=";

    hash_deb_amd64 = "sha256-tNkO1mPZg1xltBfoWeNhLekITtZV/WNgu//i2DJb17c=";

    version = "123.0.6312.122";

    hash = "sha256-apEniFKhIxPo4nhp9gCU+WpiV/EB40qif4RfE7Uniog=";

    hash_deb_amd64 = "sha256-rSbigG5/xbL32d1ntOn6gnZyxSpgrg1h7lb/RD4YROI=";

    version = "124.0.6367.60";

  };

  ungoogled-chromium = {

    deps = {