Commit graph

288 commits

Author SHA1 Message Date
aszlig bc5ce1f1b0
chromium: Update stable and beta channels.
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>
2015-07-04 02:31:45 +02:00
aszlig 7e6d6e034d
chromium: Disable setuid sandbox without errors.
Just silencing the error will not prevent Chromium from trying to start
up the SUID sandbox anyway, thus flooding stderr with:

LaunchProcess: failed to execvp:

After digging a bit in the source code I found out that the SUID sandbox
binary is indeed used, but only for setting oom_score_adj within the
user namespace (as "root"). So let's build the sandbox binary and of
course don't set setuid bit.

These annoying error messages were originally introduced by 0aad4b7 and
I'm deeply sorry for annoying you guys out there with them.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-07-04 02:31:45 +02:00
aszlig a80437e236
chromium: Remove out-of-tree sandbox derivation.
Since 0aad4b7, we no longer need to have an external sandbox binary,
because the upstream implementation of the user namespace sandbox no
longer needs an external sandbox binary.

In our implementation of the user namespace sandbox, we (ab)used the
setuid sandbox to run non-setuid and set up user namespaces instead.

Because our implementation is no longer needed, we can safely drop the
external binary entirely.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-07-04 02:31:44 +02:00
aszlig 97ddd04ca9
chromium: Remove obsolete sandbox_userns_36.patch.
The file is no longer referenced since 6a8afa4 and thus can be safely
dropped.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-07-04 02:31:44 +02:00
aszlig 7143f34970
chromium: Drop references to version 42 and below.
Since 7d217e3 the lowest version number is 43, so all those conditionals
are no longer needed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-06-23 03:35:30 +02:00
aszlig cadd675e7a
chromium: Disable "hotwording" by default.
There has been some recent news about that component extension on hacker
news:

https://news.ycombinator.com/item?id=9724409

Even though on our side it won't work, because we don't have NaCl
enabled by default or even working (I honestly haven't tested if it even
builds if enabled), we might get to the point where we can build with
NaCl enabled.

But until and even after that day, we want to have explicit control on
whether this extension is enabled.

Please also have a look at these two issues explaining the details
(about component extensions and the hotwording extension in particular):

https://crbug.com/491435
https://crbug.com/500922

Fixes issue #8358.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-06-23 03:35:30 +02:00
aszlig c290595e5b
chromium: Update all channels to latest versions.
Overview of the updated versions:

stable: 43.0.2357.124 -> 43.0.2357.125
beta:   44.0.2403.39  -> 44.0.2403.52  [1]
dev:    45.0.2421.0   -> 45.0.2431.0   [2]

[1] Beta channel fixes:

    I had to fetch a patch from a newer revision of Blink (r195908), see
    https://codereview.chromium.org/1157943002/ for more information
    about the patch.

    Here is the failing build log:

    https://headcounter.org/hydra/build/704037/nixlog/2

    Another fix for Blink, was needed in order to get it to build,
    see: https://codereview.chromium.org/1156113007/

    Also I needed to revert https://codereview.chromium.org/1150543002/
    using another patch, because the build won't succeed and bail out
    with WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE not being found (it's only
    used once in the source, but isn't defined anywhere). Here are the
    trybot results:

    https://chromium-cq-status.appspot.com/patch-status/1150543002/20001

[2] Dev channel fixes:

    The "ffmpegsumo" shared library is now no longer built, because it
    is now statically linked against Chromium, for details see:

    https://codereview.chromium.org/1141703002

All channels built and tested on my Hydra at:

https://headcounter.org/hydra/eval/178458

Test reports:

x86:    https://headcounter.org/hydra/build/704908/download/1/log.html
x86_64: https://headcounter.org/hydra/build/704914/download/1/log.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-06-23 03:35:30 +02:00
aszlig af54ddf8b6
chromium: Drop plugin_paths patch for old versions.
The patch was for versions prior to version 22, so we no longer need it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-06-11 19:54:11 +02:00
aszlig 6a8afa4bb3
chromium: Fix plugin_paths patch for version 44.
The pepper effects plugin has been removed and migrated to NaCl, so I'm
just dropping the hunk of that patch.

Upstream reviow URL: https://codereview.chromium.org/1085393003

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-06-11 19:54:11 +02:00
Ambroz Bizjak 58fd4f672f Chromium: Update and build fixes.
Changes included:
- Update versions.
- Use gyp package not gyp_svn1977.
- Remove icu from buildInputs, since this causes a build error due to inferference with use_system_icu=false.
- Remove the hack that inserts the absolute path into gyp files, and pass `--depth .` to gyp. This resolves the `third_party/angle` gyp error.
- Do a normal copy of the source code not a symlink copy. This resolves some link error where the symlinks interfere with relative paths (seems like because gyp resolves symlinks first). Note, this used to be worked around with the absolute path insertion hack.
- Change the bucketURL in update.nix to https (for more secure updates).
2015-06-11 18:23:58 +02:00
William A. Kennington III b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
aszlig b26de39252
gyp: Revive old SVN version to build Chromium.
Works around regression from a305e6855d.

We're also marking it lowPrio to make sure nobody will accidentally
reference it using nix-env -i.

Until we have fixed #7402, we're going to build with the old gyp version
to prevent being affected by https://crbug.com/462153.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-05-22 11:37:40 +02:00
aszlig 310da1b4da
chromium/update: Remove reference to <nixpkgs>.
We shouldn't make assumptions on what is set by NIX_PATH in order to
make it easier to rename that Nix path reference.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-29 08:22:48 +02:00
aszlig fce7113345
chromium: Add missing dependency on libcap.
After the pulseaudio refactor in NixOS/nixpkgs@a2a3508, libcap is no
longer propagated to chromium anymore. And we need to have libcap for
the renderer sandbox.

Build log: https://hydra.nixos.org/build/21689759/nixlog/1/raw

What makes me wonder is that given that this was propagated by
pulseaudio noone either seemed to have disabled pulseaudio support for
Chromium or just didn't report the build failure.

Half-assed testing done against all channels, because it builds the
sandbox and we can't break an already broken build twice (or maybe we
can, who knows...).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-27 07:24:11 +02:00
William A. Kennington III a5ae04f179 chromium: Update
Tested that chromium, chromiumBeta, chromiumDev all build
2015-03-12 12:32:32 -07:00
aszlig 089bdce621
Re-re-revert "chromium: remove preferLocalBuild".
This reverts commit 0696b0ef78.

Okay, now finally, let's get this straight. We actually *want*
preferLocalBuild, *because* we have improved the source splitup in
c92dbffeac.

The idea is to use local builds in order to prevent the source being
pushed to a remote machine, splitted up there (and thus copied again)
and then being copied *again* FROM the remote machine.

"DOH!" - as @edolstra or @rbvermaa would call it... and good d^Hnight.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-02-22 08:31:25 +01:00
aszlig 0696b0ef78
Re-revert "chromium: remove preferLocalBuild".
This reverts commit 26f024626c.

I actually wasn't reading the "remove" in the commit message, so sorry
for the brainfart/noise.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-02-22 08:07:23 +01:00
aszlig 26f024626c
Revert "chromium: remove preferLocalBuild"
This reverts commit fdb5cf8107.

The reason I'm reverting this is that the implications this had on the
IO load of Hydra are fixed by c92dbffeac.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-02-22 07:55:33 +01:00
aszlig c92dbffeac
chromium: Split up the source tarball on the fly.
So far we've done the source code split up by using the generic
unpackPhase and copying it all over into the different outputs.

However, this had the problem of generating the I/O load of about three
times the size of the source tree: First at fetchurl of the tarball
(although it's not as much because it's compressed), second at
unpackPhase and third at installPhase.

Now we don't use installPhase anymore and directly unpack into the
output paths, which unfortunately becomes quite a bit more complex
because we need to transform the paths of the tar file on the fly.

I've also tried using GNU Tar's --to-command option to even untar *and*
patch it at the same time, but forking for every single file in the
tarball gets REALLY slow and also gets even more complex than this two
stage approach because you need to make sure that the patch file is
applied correctly, for example for files that don't yet exist but are to
be created by the patch file.

We're using --anchored and --no-wildcards-match-slash here to prevent
accidentally excluding files we don't want to exclude. One example is
something like v8/tools/gyp/v8.gyp.

So the current approach is some compromise between complexity and speed
and should hopefully get rid of the Hydra build timeouts by lowering I/O
load.

See here for examples of builds having this issue:

http://hydra.nixos.org/build/19045023
http://hydra.nixos.org/build/19044973
http://hydra.nixos.org/build/19044968
http://hydra.nixos.org/build/19045019

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-02-22 07:52:53 +01:00
aszlig 0aad4b7ee4
chromium: Update all channels to latest versions.
Overview of the updated versions:

stable: 40.0.2214.91 -> 40.0.2214.115
beta:   41.0.2272.16 -> 41.0.2272.64
dev:    41.0.2272.16 -> 42.0.2305.3

Introduces 42.0.2305.3 as the new dev version, which no longer requires
our user namespaces sandbox patch. Thanks to everyone participating in
https://crbug.com/312380 for finally having this upstream.

In the course of supporting the official namespace sandbox (that's what
the user namespace sandbox is called), a few things needed to be fixed
for version 42:

 * Add an updated nix_plugin_paths.patch, because the old
   one tries to patch the path for libpdf, which is now natively included
   in Chromium.

 * Don't copy libpdf.so to libexec path for version 42, it's no longer
   needed as it's completely built-in now.

 * Disable SUID sandbox directly in the source instead of going the easy
   route of passing --disable-setuid-sandbox. The reason is that with
   the command line flag a nasty nagbar will appear.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-02-22 07:52:52 +01:00
Domen Kožar fdb5cf8107 chromium: remove preferLocalBuild due to intense IO in VM tests
(cherry picked from commit 84bd62da0a63e18fa285bacf0e648b82d601816e)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-02-06 12:08:43 +01:00
Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
aszlig 9343f6f461
chromium: Ensure runtime deps for enabled plugins.
We're propagating the plugin flags by importing from another Nix
expression file, which in turn exports the Nix path to the wrapper. This
causes that the store path isn't referenced in the wrapper and the path
isn't recognized by scanning the wrapper script (only those already
referenced at build time are).

So let's add the activated plugins to the buildInputs of the wrapper.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-26 09:31:03 +01:00
aszlig ced5afc38c
chromium: Update all channels to latest versions.
This brings a new stable version 40.0.2214.91 along with a beta update
to version 41.0.2272.16, the dev channel is still stuck at version
41.0.2272.12 and within the next days will jump to version 42.

For this reason, I've done some cheating here and brought the beta
channel in par with the dev channel, because dev is older than beta on
OmahaProxy.

Here's an overview of the channel upgrades:

stable: 39.0.2171.65 -> 40.0.2214.91 [1]
beta:   40.0.2214.10 -> 41.0.2272.16 [1] [2] [3]
dev:    41.0.2224.3  -> 41.0.2272.16 [1] [2] [3]

[1]: We needed to patch in locations of lib{pci,udev}.so, because
     Chromium tries to load them at runtime. For version 41 startup will
     fail if it is unable to load libudev, but it also has the advantage
     that this fixes GPU detection using libpci in the stable version,
     which in turn could fix a few bugs on NixOS.

[2]: The upstream Debian package for the binary plugins now uses XZ
     compression for the enclosed data tarball.

[3]: Chromium 41 needs {shapshot,natives}_blob.bin in order to start up,
     so let's cp it among with the .pak files to avoid adding a
     conditional for version 40.

The release annoucement of the stable channel update can be found here:

http://googlechromereleases.blogspot.de/2015/01/stable-update.html

Note that this release contains 62 security fixes(!) and I'm hereby
apologizing for the delay of this update.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-26 09:31:03 +01:00
Eric Seidel f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
aszlig 536feffc68
chromium: Fix userns patch for kernel 3.18.2.
Writing the gid_map is already non-fatal, but the actual sandbox process
still tries to setresgid() to nogroup (usually 65534). This however
fails, because if user namespace sandboxing is present, the namespace
doesn't have CAP_SETGID at this point.

Fortunately, the effective GID is already 65534, so we just need to
check whether the target gid matches and only(!) setresgid() if it
doesn't.

So if someone would run a SUID version of the sandbox, it would still
work nonetheless without a negative impact on security.

Fixes #5730, thanks to @wizeman for reporting and initial debugging.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-13 06:18:10 +01:00
William A. Kennington III afeef240dc kerberos: Use default kerberos instead of krb5 2014-12-30 00:05:12 -08:00
John Wiegley 28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
aszlig 597373bbd5
chromium: Precompile pycs instead of deleting.
This is more of an attempt rather than a real fix (or maybe it is? let's
see) for the corrupted .pyc files during build. I believe the reason we
get these are likely due to several instances of the Python interpreter
that run in parallel and one of these processes might still be writing
the .pyc file.

So, rather than deleting all .pyc files, we now precompile then in order
to avoid any build process trying to generate any .pyc file.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-12-25 07:10:12 +01:00
Domen Kožar 4124a0bd9c chromium: enable cups by default 2014-12-07 14:56:18 +01:00
Ricardo M. Correia d4b4bae307 Update my maintainership 2014-11-29 02:15:39 +01:00
aszlig 78a73ab041
chromium: Remove .py[co] files prior to building.
Thanks to @iElectric for the notification, although I'm not really sure
whether this will fix the following failed Hydra build:

http://hydra.nixos.org/build/17609086/nixlog/1/raw

The reason is that this failure doesn't happen on every build, but let's
see whether it will happen again now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-27 17:55:19 +01:00
Domen Kožar 412a2e21fb chromium: set two additional mimetypes for desktop icon 2014-11-26 20:56:29 +01:00
aszlig 28b29f173d
chromium: Switch to using bundled protobuf.
This is a response to 1fdefd5562.

We are already using bundled protobuf for the beta and dev channels and
it also breaks regularly with about every new Chromium release, so let's
use bundled protobuf for all channels now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-25 14:14:58 +01:00
aszlig 690a845de9
chromium: Use Nix expressions for plugin settings.
We now create Nix expressions within the plugin output path(s) which
then will be imported and incorporated into the wrapper. This makes it
easier for other plugins to provide configuration settings to the main
Chromium wrapper.

Of course, in order to allow for external plugins we need to allow
passing a list of plugins to the Chromium derivation, but right now we
keep it internal and only use it for things such as NaCl (as soon as we
support it, of course).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-25 14:14:43 +01:00
aszlig 518173ac24
chromium: Shorten line length of name attribute.
No feature change, I'm just very nitpicky if it comes to lines with more
than 79 characters.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-25 14:14:43 +01:00
aszlig 7eb4d3a3a9
chromium: Switch to use open-source PDF plugin.
The Chromium PDF plugin is now available as open source software and is
already included in the Chromium source tree in current stable, so there
is no need to extract it from the Chrome binary package anymore.

See release announcement at http://blog.foxitsoftware.com/?p=641

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-22 04:26:18 +01:00
aszlig 1b84fbf0ca
chromium: Allow env vars for passing plugin paths.
Introduces environment variables to set plugin base paths. The schema
for these is like NIX_CHROMIUM_PLUGIN_PATH_<N>. Where <N> is the path
type we want to change, the supported (full) variable names are:

 * NIX_CHROMIUM_PLUGIN_PATH_ALL
 * NIX_CHROMIUM_PLUGIN_PATH_PEPPERFLASH
 * NIX_CHROMIUM_PLUGIN_PATH_FILEFLASH
 * NIX_CHROMIUM_PLUGIN_PATH_PDF
 * NIX_CHROMIUM_PLUGIN_PATH_FILE_EFFECTS
 * NIX_CHROMIUM_PLUGIN_PATH_NACL
 * NIX_CHROMIUM_PLUGIN_PATH_PNACL
 * NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE

Whereas NIX_CHROMIUM_PLUGIN_PATH_ALL is the plugin base path for every
path which is not set explicitly, so by setting ..._ALL and not setting
..._WIDEVINE, the widevine plugin will be searched in the directory
specified using ..._ALL.

Right now, the only plugin where this is used is widevine, and it still
doesn't properly work yet.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-22 04:26:17 +01:00
aszlig 2495e819aa
chromium: Update all channels to latest versions.
With this commit, the following new upstream versions are introduced:

stable: 38.0.2125.101 -> 39.0.2171.65
beta:   39.0.2171.19  -> 40.0.2214.10
dev:    40.0.2182.3   -> 41.0.2224.3

We can now remove missing_alg_import.patch, because version 39 is nom
stable and thus fixes the missing include directive upstream.

However, starting with version 40, we hit a few bugs with system
protobuf, so we're disabling it for every version >=40 to avoid
runtime/startup errors.

Here is the stable channel announcement for version 39 on the official
blog:

http://googlechromereleases.blogspot.de/2014/11/stable-channel-update_18.html

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-22 03:45:10 +01:00
Domen Kožar 9a48f6f9ef Revert "chromium: update dev, beta, stable channels"
This reverts commit 32df2a0838.

See
32df2a0838 (commitcomment-8260774)
2014-10-22 17:42:29 +02:00
Domen Kožar 32df2a0838 chromium: update dev, beta, stable channels 2014-10-22 15:06:05 +02:00
aszlig ea7e43768a
chromium: Drop conditionals for version 37.
No longer needed, because Chromium version 37 is no longer the current
stable version.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-14 14:41:46 +02:00
Aristid Breitkreuz 23956842d4 chromiumStable 38.0.2125.101, chromiumBeta 39.0.2171.19, chromiumDev 40.0.2182.3 2014-10-10 22:17:47 +02:00
aszlig d3a7c50364
chromium: Add WideVine content decryption plugin.
Seems to be needed in order to view Netflix content, but this only pulls
in the proprietary plugin and doesn't yet compile Chromium with support
for it, so this is only in preparation for the bright and shiny future
(where we all have rootkits implanted in our body).

Of course, this plugin is disabled by default as well as all the other
proprietary plugins.

For the plugin derivation, we now do the checkPhase _after_ the
installPhase, to make sure we also detect RPATHs pointing to the plugin
directory itself, because the shared object files only exist after the
installPhase.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-06 07:24:33 +02:00
aszlig b159458c34
chromium: Update all channels to latest versions.
With this commit, the following new upstream versions are introduced:

stable: 37.0.2062.94 -> 37.0.2062.120
beta:   38.0.2125.24 -> 38.0.2125.101
dev:    39.0.2138.3  -> 39.0.2171.7

All channels built fine on my machine and were tested against a few
sites.

The missing_alg_import.patch now is no longer needed for version 39, so
we're not applying it there anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-10-06 07:24:32 +02:00
Eelco Dolstra 31189616e4 Rename chromium-stable -> chromium
Suffixes like "-stable" are superfluous because packages are assumed
to be stable. This makes "nix-env -i chromium" do the expected thing.
2014-10-03 17:47:30 +02:00
Dmitry V 62b20fc86e add symlink to chromium-browser for xdg-open to work as expected 2014-09-19 21:51:32 +02:00
Thomas Strobel 1f28161a41 Add configuration flag to chromium: hiDPISupport
By default, hiDPISupport is disabled.
2014-09-16 00:44:34 +02:00
aszlig f175833fd6
chromium: Update beta and dev to latest versions.
beta: 37.0.2062.94 -> 38.0.2125.24 (builds fine, tested)
dev:  38.0.2125.8  -> 39.0.2138.3  (builds fine, tested)

Introduces the new version 39 and finally separates stable/beta again.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-30 09:34:07 +02:00
Cray Elliott 8eb3de7c86 Chromium patch, fixes missing header 2014-08-29 20:48:02 +02:00