2
0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 15:13:46 +00:00

chromium: Make the gnChromium overrides depend on the version

This is more robust than depending on the channel, though the version
should only matter if the configuration phase fails.
This also switches to the intended version for `chromium` which should
be higher since M85 is in the stable channel.

Thanks `@volth` for pointing this out.
This commit is contained in:
Michael Weiss 2020-08-25 23:03:35 +02:00
parent 4252ba90f4
commit 25aed428aa
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83

View File

@ -28,7 +28,7 @@ let
callPackage = newScope chromium; callPackage = newScope chromium;
chromium = { chromium = rec {
inherit stdenv llvmPackages; inherit stdenv llvmPackages;
upstream-info = (callPackage ./update.nix {}).getChannel channel; upstream-info = (callPackage ./update.nix {}).getChannel channel;
@ -36,15 +36,6 @@ let
mkChromiumDerivation = callPackage ./common.nix ({ mkChromiumDerivation = callPackage ./common.nix ({
inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone; inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone;
# TODO: Remove after we can update gn for the stable channel (backward incompatible changes): # TODO: Remove after we can update gn for the stable channel (backward incompatible changes):
gnChromium = gn.overrideAttrs (oldAttrs: {
version = "2020-03-23";
src = fetchgit {
url = "https://gn.googlesource.com/gn";
rev = "5ed3c9cc67b090d5e311e4bd2aba072173e82db9";
sha256 = "00y2d35wvqmx9glaqhfb62wdgbfpwr77v0934nnvh9ks71vnsjqy";
};
});
} // lib.optionalAttrs (channel == "beta") {
gnChromium = gn.overrideAttrs (oldAttrs: { gnChromium = gn.overrideAttrs (oldAttrs: {
version = "2020-05-19"; version = "2020-05-19";
src = fetchgit { src = fetchgit {
@ -53,7 +44,7 @@ let
sha256 = "0197msabskgfbxvhzq73gc3wlr3n9cr4bzrhy5z5irbvy05lxk17"; sha256 = "0197msabskgfbxvhzq73gc3wlr3n9cr4bzrhy5z5irbvy05lxk17";
}; };
}); });
} // lib.optionalAttrs (channel == "dev") { } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "86") {
gnChromium = gn.overrideAttrs (oldAttrs: { gnChromium = gn.overrideAttrs (oldAttrs: {
version = "2020-07-20"; version = "2020-07-20";
src = fetchgit { src = fetchgit {