Skip to content

Commit

Permalink
ungoogled-chromium: Try to fix an evaluation error on Hydra
Browse files Browse the repository at this point in the history
This should fix a regression from #106475 (hopefully this is the only
issue, my current implementation with channel+ungoogled isn't ideal):
#106475 (comment)
  • Loading branch information
primeos committed Dec 18, 2020
1 parent d8cb103 commit be94a4c
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions pkgs/applications/networking/browsers/chromium/default.nix
Expand Up @@ -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 {
Expand Down

0 comments on commit be94a4c

Please sign in to comment.