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

Merge pull request #215509 from michaeladler/ungoogled 

ungoogled-chromium: 109.0.5414.120 -> 110.0.5481.78
parents 53bf06bd 998c3cd1

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

+2 −11
Original line number Diff line number Diff line
@@ -150,10 +150,10 @@ let 
      libdrm wayland mesa.drivers libxkbcommon

      curl

      libepoxy

      libffi

    ] ++ lib.optional systemdSupport systemd

      ++ lib.optionals cupsSupport [ libgcrypt cups ]

      ++ lib.optional pulseSupport libpulseaudio

      ++ lib.optional (chromiumVersionAtLeast "110") libffi;

      ++ lib.optional pulseSupport libpulseaudio;



    patches = [

      # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed):
@@ -293,15 +293,6 @@ let 
      chrome_pgo_phase = 0;

      clang_base_path = "${llvmPackages.clang}";

      use_qt = false;

    } // lib.optionalAttrs (!chromiumVersionAtLeast "110") {

      # The default has changed to false. We'll build with libwayland from

      # Nixpkgs for now but might want to eventually use the bundled libwayland

      # as well to avoid incompatibilities (if this continues to be a problem

      # from time to time):

      use_system_libwayland = true;

      # The default value is hardcoded instead of using pkg-config:

      system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner";

    } // lib.optionalAttrs (chromiumVersionAtLeast "110") {

      # To fix the build as we don't provide libffi_pic.a

      # (ld.lld: error: unable to find library -l:libffi_pic.a):

      use_system_libffi = true;

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

+7 −7
Original line number Diff line number Diff line
@@ -45,19 +45,19 @@ 
    }

  },

  "ungoogled-chromium": {

    "version": "109.0.5414.120",

    "sha256": "1yvfd0a7zfz4x00f83irrs6hy15wn85mrbbm7mk5wy4gjwg5zyrj",

    "version": "110.0.5481.78",

    "sha256": "1m67xfdgggaan09xsbppna209b8sm882xq587i0hsnnnzb3fdxdj",

    "sha256bin64": null,

    "deps": {

      "gn": {

        "version": "2022-11-10",

        "version": "2022-12-12",

        "url": "https://gn.googlesource.com/gn",

        "rev": "1c4151ff5c1d6fbf7fa800b8d4bb34d3abc03a41",

        "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b"

        "rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8",

        "sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30"

      },

      "ungoogled-patches": {

        "rev": "109.0.5414.120-1",

        "sha256": "0hq48lsjl7da8rdq129mc7cd0z5ykqbaf1sbhhs1d10dzm5zs4p3"

        "rev": "110.0.5481.78-1",

        "sha256": "1ffb2wf1bdmzlxk4ih8qq439jzqz17f8nchvx7na52y48am1qr3c"

      }

    }

  }