From a28fe192038995f8267b9d280bc4483e35952825 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 3 Nov 2012 12:44:47 +0100 Subject: [PATCH] chromium: Update dev and beta channels. beta: 23.0.1271.60 (build successful) dev: 24.0.1312.2 (build successful after patching) The development version needs a patch in order to build properly against PulseAudio. Issue and origin of the patch can be found here: http://crbug.com/157876 Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 10 +++++++++- .../networking/browsers/chromium/sources.nix | 12 ++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index cb0561fa09a0..c8a470ce9da2 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -88,6 +88,13 @@ let pre23 = versionOlder sourceInfo.version "23.0.0.0"; in optional pre23 ./enable_seccomp.patch; + maybeFixPulseAudioBuild = let + post23 = !versionOlder sourceInfo.version "24.0.0.0"; + in optional (post23 && cfg.pulseaudio) (fetchurl { + url = http://archrepo.jeago.com/sources/chromium-dev/pulse_audio_fix.patch; + sha256 = "1w91mirrkqigdhsj892mqxlc0nlv1dsp5shc46w9xf8nl96jxgfb"; + }); + in stdenv.mkDerivation rec { name = "${packageName}-${version}"; packageName = "chromium"; @@ -121,7 +128,8 @@ in stdenv.mkDerivation rec { patches = optional cfg.cups ./cups_allow_deprecated.patch ++ optional cfg.pulseaudio ./pulseaudio_array_bounds.patch - ++ maybeSeccompPatch; + ++ maybeSeccompPatch + ++ maybeFixPulseAudioBuild; postPatch = optionalString cfg.openssl '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index b8d010340b3d..e829f00471cf 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,14 +1,14 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "24.0.1297.0"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1297.0.tar.bz2"; - sha256 = "1qwqpj5xnv9fsi8k79c6fzlry32h47w6chxabz3l819c008yrqa4"; + version = "24.0.1312.2"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.2.tar.bz2"; + sha256 = "155l6sm76cp2vzmm673dnb0vcz7akrz6xfp6jsmaa1175h0yal6h"; }; beta = { - version = "23.0.1271.40"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.40.tar.bz2"; - sha256 = "151yp9rw7v693mw4glmswl7ls2yx3zk0sz1n646brs5wrnbci9l0"; + version = "23.0.1271.60"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.60.tar.bz2"; + sha256 = "1xsa27ay37jls9jiwqn7wfsc4ag02qd316gszb226hp2vhfv6pf2"; }; stable = { version = "22.0.1229.94";