diff options
| author | Orivej Desh <orivej@gmx.fr> | 2020-05-22 09:13:23 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2020-05-22 09:13:23 +0000 |
| commit | 16d7f7edae6847e7a792d79b533b245f71907f46 (patch) | |
| tree | a304b937bc072e96e2745ede17c7e6b9b4495bee /pkgs/applications/networking/browsers/chromium/default.nix | |
| parent | eae4f22176789ce3b6a66bad773a45b12e895cdf (diff) | |
| parent | 5de1e307f29ab91baeb43ab2a58ed13a944e40ea (diff) | |
| download | nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.gz nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.bz2 nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.lz nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.xz nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.zst nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/default.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 25ef76f331ba..df1dcb413e15 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -22,9 +22,7 @@ }: let - llvmPackages = if channel != "stable" - then llvmPackages_10 - else llvmPackages_9; + llvmPackages = llvmPackages_10; stdenv = llvmPackages.stdenv; callPackage = newScope chromium; @@ -36,8 +34,6 @@ let mkChromiumDerivation = callPackage ./common.nix ({ inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone; - gnChromium = gn; - } // lib.optionalAttrs (channel != "stable") { # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-03-23"; |