alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

chromium: Update dev and beta channels.

Browse source 
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 <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2012-11-03 12:44:47 +01:00
parent 3d76661bd8
commit a28fe19203
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -88,6 +88,13 @@ let
pre23 = versionOlder sourceInfo.version "23.0.0.0"; pre23 = versionOlder sourceInfo.version "23.0.0.0";
in optional pre23 ./enable_seccomp.patch; 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 { in stdenv.mkDerivation rec {
name = "${packageName}-${version}"; name = "${packageName}-${version}";
packageName = "chromium"; packageName = "chromium";
@ -121,7 +128,8 @@ in stdenv.mkDerivation rec {
patches = optional cfg.cups ./cups_allow_deprecated.patch patches = optional cfg.cups ./cups_allow_deprecated.patch
++ optional cfg.pulseaudio ./pulseaudio_array_bounds.patch ++ optional cfg.pulseaudio ./pulseaudio_array_bounds.patch
++ maybeSeccompPatch; ++ maybeSeccompPatch
++ maybeFixPulseAudioBuild;
postPatch = optionalString cfg.openssl '' postPatch = optionalString cfg.openssl ''
cat $opensslPatches | patch -p1 -d third_party/openssl/openssl cat $opensslPatches | patch -p1 -d third_party/openssl/openssl

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

@ -1,14 +1,14 @@
# This file is autogenerated from update.sh in the same directory. # This file is autogenerated from update.sh in the same directory.
{ {
dev = { dev = {
version = "24.0.1297.0"; version = "24.0.1312.2";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1297.0.tar.bz2"; url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.2.tar.bz2";
sha256 = "1qwqpj5xnv9fsi8k79c6fzlry32h47w6chxabz3l819c008yrqa4"; sha256 = "155l6sm76cp2vzmm673dnb0vcz7akrz6xfp6jsmaa1175h0yal6h";
}; };
beta = { beta = {
version = "23.0.1271.40"; version = "23.0.1271.60";
url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.40.tar.bz2"; url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.60.tar.bz2";
sha256 = "151yp9rw7v693mw4glmswl7ls2yx3zk0sz1n646brs5wrnbci9l0"; sha256 = "1xsa27ay37jls9jiwqn7wfsc4ag02qd316gszb226hp2vhfv6pf2";
}; };
stable = { stable = {
version = "22.0.1229.94"; version = "22.0.1229.94";