mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
4cbedd7322
With this commit, the following new upstream versions are introduced:
stable: 35.0.1916.114 -> 35.0.1916.153
beta: 35.0.1916.86 -> 36.0.1985.67
dev: 36.0.1964.2 -> 37.0.2054.3
All builds successfully tested on my machine, however in order to update
the beta and dev channels, a few additional modifications were
necessary:
* Update/rebase USER_NS sandbox patch for version 36 and higher.
* Create address_input_strings.grdp before running gyp in version 37.
* Remove an empty string leftover from 0517041.
* Add patch for building bundled Angle for version 37.
The patch for Angle is to remove reliance on git being present during
build and is from https://chromium-review.googlesource.com/202048 but
with own modifications to remove/fix Windows-specific parts within the
patch file.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
81 lines
2.1 KiB
Nix
81 lines
2.1 KiB
Nix
{ stdenv, fetchurl, python
|
|
, channel ? "stable"
|
|
, useOpenSSL # XXX
|
|
}:
|
|
|
|
with stdenv.lib;
|
|
|
|
with (import ./update.nix {
|
|
inherit (stdenv) system;
|
|
}).getChannel channel;
|
|
|
|
stdenv.mkDerivation {
|
|
name = "chromium-source-${version}";
|
|
|
|
src = fetchurl main;
|
|
|
|
buildInputs = [ python ]; # cannot patch shebangs otherwise
|
|
|
|
phases = [ "unpackPhase" "patchPhase" "installPhase" ];
|
|
|
|
opensslPatches = optional useOpenSSL openssl.patches;
|
|
|
|
prePatch = "patchShebangs .";
|
|
|
|
patches = if (versionOlder version "36.0.0.0")
|
|
then singleton ./sandbox_userns_31.patch
|
|
else singleton ./sandbox_userns_36.patch;
|
|
|
|
postPatch = ''
|
|
sed -i -r \
|
|
-e 's/-f(stack-protector)(-all)?/-fno-\1/' \
|
|
-e 's|/bin/echo|echo|' \
|
|
-e "/python_arch/s/: *'[^']*'/: '""'/" \
|
|
build/common.gypi chrome/chrome_tests.gypi
|
|
sed -i -e '/not RunGN/,+1d' -e '/import.*depot/d' build/gyp_chromium
|
|
sed -i -e 's|/usr/bin/gcc|gcc|' \
|
|
third_party/WebKit/Source/build/scripts/scripts.gypi \
|
|
third_party/WebKit/Source/build/scripts/preprocessor.pm
|
|
'' + optionalString useOpenSSL ''
|
|
cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
|
|
'' + optionalString (!versionOlder version "37.0.0.0") ''
|
|
patch -p1 -d third_party/angle < "${./angle_build_37.patch}"
|
|
'';
|
|
|
|
outputs = [ "out" "sandbox" "bundled" "main" ];
|
|
installPhase = ''
|
|
ensureDir "$out" "$sandbox" "$bundled" "$main"
|
|
|
|
header "copying browser main sources to $main"
|
|
find . -mindepth 1 -maxdepth 1 \
|
|
\! -path ./sandbox \
|
|
\! -path ./third_party \
|
|
\! -path ./build \
|
|
\! -path ./tools \
|
|
\! -name '.*' \
|
|
-print | xargs cp -rt "$main"
|
|
stopNest
|
|
|
|
header "copying sandbox components to $sandbox"
|
|
cp -rt "$sandbox" sandbox/*
|
|
stopNest
|
|
|
|
header "copying third party sources to $bundled"
|
|
cp -rt "$bundled" third_party/*
|
|
stopNest
|
|
|
|
header "copying build requisites to $out"
|
|
cp -rt "$out" build tools
|
|
stopNest
|
|
|
|
rm -rf "$out/tools/gyp" # XXX: Don't even copy it in the first place.
|
|
'';
|
|
|
|
preferLocalBuild = true;
|
|
|
|
passthru = {
|
|
inherit version channel;
|
|
plugins = fetchurl binary;
|
|
};
|
|
}
|