diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2020-12-18 16:21:37 +0100 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2020-12-18 16:21:37 +0100 |
| commit | be94a4cf235ca11e05a549a1128bc2ae19ab4293 (patch) | |
| tree | 0a8039c1f4526f772f4101d336bf7b49ea664d22 /pkgs/applications/networking/browsers/chromium/default.nix | |
| parent | d8cb103f7909a36755ca4e7ca5743802ee4cb982 (diff) | |
| download | nixpkgs-be94a4cf235ca11e05a549a1128bc2ae19ab4293.tar nixpkgs-be94a4cf235ca11e05a549a1128bc2ae19ab4293.tar.gz nixpkgs-be94a4cf235ca11e05a549a1128bc2ae19ab4293.tar.bz2 nixpkgs-be94a4cf235ca11e05a549a1128bc2ae19ab4293.tar.lz nixpkgs-be94a4cf235ca11e05a549a1128bc2ae19ab4293.tar.xz nixpkgs-be94a4cf235ca11e05a549a1128bc2ae19ab4293.tar.zst nixpkgs-be94a4cf235ca11e05a549a1128bc2ae19ab4293.zip | |
ungoogled-chromium: Try to fix an evaluation error on Hydra
This should fix a regression from #106475 (hopefully this is the only issue, my current implementation with channel+ungoogled isn't ideal): https://github.com/NixOS/nixpkgs/pull/106475#issuecomment-748131224
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/default.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 0cbfbc33270..6e7c2307d64 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -54,15 +54,17 @@ let pkgSuffix = if channel == "dev" then "unstable" else channel; pkgName = "google-chrome-${pkgSuffix}"; - chromeSrc = fetchurl { - urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [ - "https://dl.google.com/linux/chrome/deb/pool/main/g" - "http://95.31.35.30/chrome/pool/main/g" - "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" - "http://repo.fdzh.org/chrome/deb/pool/main/g" - ]; - sha256 = chromium.upstream-info.sha256bin64; - }; + chromeSrc = if channel == "ungoogled-chromium" + then throw "Google Chrome is not supported for the ungoogled-chromium channel." + else fetchurl { + urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [ + "https://dl.google.com/linux/chrome/deb/pool/main/g" + "http://95.31.35.30/chrome/pool/main/g" + "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" + "http://repo.fdzh.org/chrome/deb/pool/main/g" + ]; + sha256 = chromium.upstream-info.sha256bin64; + }; mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}"; widevineCdm = stdenv.mkDerivation { |