diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2020-08-25 23:03:35 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2020-08-25 23:22:41 +0200 |
commit | 25aed428aa9974615e628f842aaf4a0db926cdec (patch) | |
tree | 87968fa036766f102a3ac56905ee7b732399745d /pkgs/applications/networking | |
parent | 4252ba90f4e8628607c9f3f3aa52e121bca87532 (diff) | |
download | nixpkgs-25aed428aa9974615e628f842aaf4a0db926cdec.tar nixpkgs-25aed428aa9974615e628f842aaf4a0db926cdec.tar.gz nixpkgs-25aed428aa9974615e628f842aaf4a0db926cdec.tar.bz2 nixpkgs-25aed428aa9974615e628f842aaf4a0db926cdec.tar.lz nixpkgs-25aed428aa9974615e628f842aaf4a0db926cdec.tar.xz nixpkgs-25aed428aa9974615e628f842aaf4a0db926cdec.tar.zst nixpkgs-25aed428aa9974615e628f842aaf4a0db926cdec.zip |
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.
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 2429baba4b3..f4ddd755fa1 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -28,7 +28,7 @@ let callPackage = newScope chromium; - chromium = { + chromium = rec { inherit stdenv llvmPackages; upstream-info = (callPackage ./update.nix {}).getChannel channel; @@ -37,15 +37,6 @@ let inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone; # 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: { version = "2020-05-19"; src = fetchgit { url = "https://gn.googlesource.com/gn"; @@ -53,7 +44,7 @@ let sha256 = "0197msabskgfbxvhzq73gc3wlr3n9cr4bzrhy5z5irbvy05lxk17"; }; }); - } // lib.optionalAttrs (channel == "dev") { + } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "86") { gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-07-20"; src = fetchgit { |