From 4f8314fb92ee57cda5103ba961d8dc9c963ffad4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 14 Jan 2013 11:21:12 +0100 Subject: [PATCH] chromium: Update dev channel to 25.0.1364.29. 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 --- pkgs/applications/networking/browsers/chromium/default.nix | 5 ++++- pkgs/applications/networking/browsers/chromium/sources.nix | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 62a4c6cc211..e32b31dc856 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -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 // { diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 7b252da6824..c7352efc002 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -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";