Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 905ecb920edc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 166520812e91
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Apr 2, 2021

  1. chromium{Beta,Dev}: Use LLVM 12 

    LLVM 12 is required but the build still fails due to other changes that
where introduced in the meantime (and Chromium 90.0.4430.51 introduced
another LLVM failure).
    @primeos
    primeos committed Apr 2, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    anthonyfok Anthony Fok
    GPG key ID: EA2500B412C59ACF
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1665208 View commit details
Showing with 4 additions and 2 deletions.
  1. +1 −1 pkgs/applications/networking/browsers/chromium/browser.nix
  2. +3 −1 pkgs/applications/networking/browsers/chromium/default.nix
2 changes: 1 addition & 1 deletion pkgs/applications/networking/browsers/chromium/browser.nix
View file
Original file line number Diff line number Diff line change
@@ -89,6 +89,6 @@ mkChromiumDerivation (base: rec {
then ["aarch64-linux" "x86_64-linux"]
else [];
timeout = 172800; # 48 hours (increased from the Hydra default of 10h)
broken = elem channel [ "beta" "dev" ]; # Build requires LLVM 12
broken = elem channel [ "beta" "dev" ];
};
})
4 changes: 3 additions & 1 deletion pkgs/applications/networking/browsers/chromium/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ newScope, config, stdenv, fetchurl, makeWrapper
, llvmPackages_11, ed, gnugrep, coreutils, xdg-utils
, llvmPackages_11, llvmPackages_12, ed, gnugrep, coreutils, xdg-utils
, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
, libva ? null
, pipewire
@@ -39,6 +39,8 @@ let
inherit (upstream-info.deps.gn) url rev sha256;
};
});
} // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "90") {
llvmPackages = llvmPackages_12;
});

browser = callPackage ./browser.nix { inherit channel enableWideVine ungoogled; };