Unverified Commit e9ebf387 authored by Michael Weiss's avatar Michael Weiss Committed by GitHub
Browse files

Merge pull request #235053 from primeos/chromiumBeta 

chromiumBeta: Fix the build with LLVM 16 by reverting a commit
parents 99c63490 16f87c4c

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

+8 −0
Original line number Diff line number Diff line
@@ -170,6 +170,14 @@ let 
      # (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21):

      # Source: https://bugs.chromium.org/p/angleproject/issues/detail?id=7582#c1

      ./patches/angle-wayland-include-protocol.patch

    ] ++ lib.optionals (chromiumVersionAtLeast "114") [

      # We need to revert this patch to build M114+ with LLVM 16:

      (githubPatch {

        # Reland [clang] Disable autoupgrading debug info in ThinLTO builds

        commit = "54969766fd2029c506befc46e9ce14d67c7ed02a";

        sha256 = "sha256-Vryjg8kyn3cxWg3PmSwYRG6zrHOqYWBMSdEMGiaPg6M=";

        revert = true;

      })

    ];



    postPatch = ''