bc5ce1f1b0
Overview of the updated versions: stable: 43.0.2357.125 -> 43.0.2357.130 beta: 44.0.2403.52 -> 44.0.2403.61 For the beta channel the following changes were necessary: * Drop all patches which were added in c290595 because they apply to 44.0.2403.52 only. The shipped version of Blink was older than the one used for Chromium itself and thus contained just the cherry-picked patches from upstream Blink. * The ffmpegsumo library is now statically linked the same way as in the dev version, so let's not try to put it into the output store path. All channels were built successfully on my Hydra at: https://headcounter.org/hydra/eval/187176 VM tests did also pass and can be found at: x86: https://headcounter.org/hydra/build/707636 x86_64: https://headcounter.org/hydra/build/707637 Signed-off-by: aszlig <aszlig@redmoonstudios.org>
84 lines
2.0 KiB
Nix
84 lines
2.0 KiB
Nix
{ stdenv, fetchurl, fetchpatch, patchutils, python
|
|
, channel ? "stable"
|
|
, useOpenSSL # XXX
|
|
}:
|
|
|
|
with stdenv.lib;
|
|
|
|
with (import ./update.nix {
|
|
inherit (stdenv) system;
|
|
}).getChannel channel;
|
|
|
|
let
|
|
transform = flags: concatStringsSep ";" (map (subst: subst + flags) [
|
|
"s,^[^/]+(.*)$,$main\\1,"
|
|
"s,$main/(build|tools)(/.*)?$,$out/\\1\\2,"
|
|
"s,$main/third_party(/.*)?$,$bundled\\1,"
|
|
"s,^/,,"
|
|
]);
|
|
|
|
pre44 = versionOlder version "44.0.0.0";
|
|
|
|
in stdenv.mkDerivation {
|
|
name = "chromium-source-${version}";
|
|
|
|
src = fetchurl main;
|
|
|
|
buildInputs = [ python ]; # cannot patch shebangs otherwise
|
|
|
|
phases = [ "unpackPhase" "patchPhase" ];
|
|
outputs = [ "out" "bundled" "main" ];
|
|
|
|
unpackPhase = ''
|
|
tar xf "$src" -C / \
|
|
--transform="${transform "xS"}" \
|
|
--anchored \
|
|
--no-wildcards-match-slash \
|
|
--exclude='*/tools/gyp' \
|
|
--exclude='*/.*'
|
|
'';
|
|
|
|
opensslPatches = optional useOpenSSL openssl.patches;
|
|
|
|
prePatch = ''
|
|
for i in $outputs; do
|
|
eval patchShebangs "\$$i"
|
|
done
|
|
'';
|
|
|
|
patches = if pre44
|
|
then singleton ./nix_plugin_paths_42.patch
|
|
else singleton ./nix_plugin_paths_44.patch;
|
|
|
|
patchPhase = let
|
|
diffmod = sym: "/^${sym} /{s/^${sym} //;${transform ""};s/^/${sym} /}";
|
|
allmods = "${diffmod "---"};${diffmod "\\+\\+\\+"}";
|
|
sedexpr = "/^(---|\\+\\+\\+) *\\/dev\\/null/b;${allmods}";
|
|
in ''
|
|
runHook prePatch
|
|
for i in $patches; do
|
|
header "applying patch $i" 3
|
|
sed -r -e "${sedexpr}" "$i" | patch -d / -p0
|
|
stopNest
|
|
done
|
|
runHook postPatch
|
|
'';
|
|
|
|
postPatch = ''
|
|
sed -i -r \
|
|
-e 's/-f(stack-protector)(-all)?/-fno-\1/' \
|
|
-e 's|/bin/echo|echo|' \
|
|
-e "/python_arch/s/: *'[^']*'/: '""'/" \
|
|
"$out/build/common.gypi" "$main/chrome/chrome_tests.gypi"
|
|
'' + optionalString useOpenSSL ''
|
|
cat $opensslPatches | patch -p1 -d "$bundled/openssl/openssl"
|
|
'';
|
|
|
|
preferLocalBuild = true;
|
|
|
|
passthru = {
|
|
inherit version channel;
|
|
plugins = fetchurl binary;
|
|
};
|
|
}
|