MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

chromium: Update dev channel to 25.0.1364.29.

Browse source 
For this update we needed to fix a bunch of things:

 * Limit pulse_audio_fix.patch to version 24 only (fixed upstream in 25).
 * Avoid the use of -fstack-protector for version 25.

The -fstack-protector option seems to be passed to libvpx now by default, so
simply use -fno-stack-protector in every occurence of -fstack-protector in
common.gypi. At least for now this will do it, but ultimately and for the future
we may want to have support for that in general.

And if we need that support in chromium directly depends on some of the next
updates to this package, as it seems that we now can switch to quite a lot of
nixpkgs dependencies instead of bundled dependencies.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2013-01-14 11:21:12 +01:00
parent c17fa1ebf2
commit 4f8314fb92
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/networking/browsers/chromium/default.nix
View file

@ -78,8 +78,9 @@ let
post23 = !versionOlder sourceInfo.version "24.0.0.0";
post24 = !versionOlder sourceInfo.version "25.0.0.0";
only24 = post23 && !post24;
maybeFixPulseAudioBuild = optional (post23 && pulseSupport)
maybeFixPulseAudioBuild = optional (only24 && pulseSupport)
./pulse_audio_fix.patch;
in stdenv.mkDerivation rec {
@ -120,6 +121,8 @@ in stdenv.mkDerivation rec {
postPatch = optionalString useOpenSSL ''
cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
'' + optionalString post24 ''
sed -i -r -e "s/-f(stack-protector)(-all)?/-fno-\1/" build/common.gypi
'';
gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {

6
pkgs/applications/networking/browsers/chromium/sources.nix
View file

@ -1,9 +1,9 @@
# This file is autogenerated from update.sh in the same directory.
{
dev = {
version = "25.0.1323.1";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1323.1.tar.bz2";
sha256 = "1i7ga1qhnjvnw2gynmpmsvvl5pxcb5z9sgldp87d9yalim5sra6s";
version = "25.0.1364.29";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.29.tar.bz2";
sha256 = "0da3in98b65rb9wkj9jxb3n07d5k7s1xpqwpvk1jz9jbp0hw7ijp";
};
beta = {
version = "24.0.1312.35";