public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #69054 from ivan/chromium-77.0.3865.90

Browse Source 
chromium: 77.0.3865.75 -> 77.0.3865.90
This commit is contained in:
Graham Christensen 2019-09-19 18:01:06 -04:00 committed by GitHub
commit 8dbca5e3ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -234,8 +234,9 @@ let
use_gold = true; use_gold = true;
gold_path = "${stdenv.cc}/bin"; gold_path = "${stdenv.cc}/bin";
is_debug = false; is_debug = false;
# at least 2X compilation speedup # Use jumbo for a 2x (at least) compilation speedup, except where it is currently broken:
use_jumbo_build = true; # https://gist.github.com/ivan/6fe7014c1b1cc35dec133fa6de0549d9
use_jumbo_build = (version != "78.0.3904.17");
proprietary_codecs = false; proprietary_codecs = false;
use_sysroot = false; use_sysroot = false;

42
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -50,6 +50,7 @@ in let
widevine = let upstream-info = chromium.upstream-info; in stdenv.mkDerivation { widevine = let upstream-info = chromium.upstream-info; in stdenv.mkDerivation {
name = "chromium-binary-plugin-widevine"; name = "chromium-binary-plugin-widevine";
# The .deb file for Google Chrome
src = upstream-info.binary; src = upstream-info.binary;
nativeBuildInputs = [ patchelfUnstable ]; nativeBuildInputs = [ patchelfUnstable ];
@ -57,14 +58,21 @@ in let
phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
unpackCmd = let unpackCmd = let
chan = if upstream-info.channel == "dev" then "chrome-unstable" soPath =
else if upstream-info.channel == "stable" then "chrome" if upstream-info.channel == "stable" then
else if upstream-info.channel == "beta" then "chrome-beta" "./opt/google/chrome/libwidevinecdm.so"
else throw "Unknown chromium channel."; else if upstream-info.channel == "beta" then
"./opt/google/chrome-beta/libwidevinecdm.so"
else if upstream-info.channel == "dev" then
"./opt/google/chrome-unstable/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"
else
throw "Unknown chromium channel.";
in '' in ''
mkdir -p plugins mkdir -p plugins
ar p "$src" data.tar.xz | tar xJ -C plugins --strip-components=4 \ # Extract just libwidevinecdm.so from upstream's .deb file
./opt/google/${chan}/libwidevinecdm.so ar p "$src" data.tar.xz | tar xJ -C plugins ${soPath}
mv plugins/${soPath} plugins/
rm -rf plugins/opt
''; '';
doCheck = true; doCheck = true;
@ -83,7 +91,10 @@ in let
"$out/lib/libwidevinecdm.so" "$out/lib/libwidevinecdm.so"
''; '';
meta.platforms = lib.platforms.x86_64; meta = {
platforms = [ "x86_64-linux" ];
license = lib.licenses.unfree;
};
}; };
suffix = if channel != "stable" then "-" + channel else ""; suffix = if channel != "stable" then "-" + channel else "";
@ -92,18 +103,21 @@ in let
version = chromium.browser.version; version = chromium.browser.version;
# This is here because we want to add the widevine shared object at the last # We want users to be able to enableWideVine without rebuilding all of
# minute in order to avoid a full rebuild of chromium. Additionally, this # chromium, so we have a separate derivation here that copies chromium
# isn't in `browser.nix` so we can avoid having to re-expose attributes of # and adds the unfree libwidevinecdm.so.
# the chromium derivation (see above: we introspect `sandboxExecutableName`).
chromiumWV = let browser = chromium.browser; in if enableWideVine then chromiumWV = let browser = chromium.browser; in if enableWideVine then
runCommand (browser.name + "-wv") { version = browser.version; } runCommand (browser.name + "-wv") { version = browser.version; }
'' ''
mkdir -p $out mkdir -p $out
cp -R ${browser}/* $out/ cp -a ${browser}/* $out/
chmod u+w $out/libexec/chromium* chmod u+w $out/libexec/chromium
if [[ ${channel} != "dev" ]]; then
cp ${widevine}/lib/libwidevinecdm.so $out/libexec/chromium/ cp ${widevine}/lib/libwidevinecdm.so $out/libexec/chromium/
# patchelf? else
mkdir -p $out/libexec/chromium/WidevineCdm/_platform_specific/linux_x64
cp ${widevine}/lib/libwidevinecdm.so $out/libexec/chromium/WidevineCdm/_platform_specific/linux_x64/
fi
'' ''
else browser; else browser;
in stdenv.mkDerivation { in stdenv.mkDerivation {

18
pkgs/applications/networking/browsers/chromium/upstream-info.nix
View File

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory. # This file is autogenerated from update.sh in the same directory.
{ {
beta = { beta = {
sha256 = "12cp24h93b48pwfywf5b6qvjdlhxrhp87qdaqbfcn6g787r2z5gb"; sha256 = "1hzgzmrn0d6cqvqnqayl048zwlcx0f7azg2rhvm7p13lvyqzsk00";
sha256bin64 = "0d9w869qqwbmw3qjvxkfm37i7dvrgmrwm5y96sm1dg2jnxqj4bdz"; sha256bin64 = "0p3275ii8800swlfmljbdrvyqjd5nlw0vgv2my4r8ccszgbhidbd";
version = "77.0.3865.75"; version = "77.0.3865.90";
}; };
dev = { dev = {
sha256 = "0x5r6xqwiggwyzbinm252xc1n3f9r7cmmzj6assi4v1nsispdh2k"; sha256 = "0zka01ml3hbximswzkkqbqq8wpiz8f4fq4wx5fys002hi69l296l";
sha256bin64 = "03yymhbpd1snycmcv7wkg5j6zbydvyc365gy5myp7wgas7cd0mb6"; sha256bin64 = "0nrip45s0ylri34vlpf16xlwv3ybmy2jg7dz8l9rvgbdwwdzdb75";
version = "78.0.3887.7"; version = "78.0.3904.17";
}; };
stable = { stable = {
sha256 = "12cp24h93b48pwfywf5b6qvjdlhxrhp87qdaqbfcn6g787r2z5gb"; sha256 = "1hzgzmrn0d6cqvqnqayl048zwlcx0f7azg2rhvm7p13lvyqzsk00";
sha256bin64 = "1wp5g09czyslkkhw3nhbp39fxfcz0pprsgj8h0aggghpdbvzph3d"; sha256bin64 = "1npx867j39mdyivf8nlkcfwgq7j34hl7s948vf6h2kqni0y50hzl";
version = "77.0.3865.75"; version = "77.0.3865.90";
}; };
} }