From e2a429584406a9e233493c032a6068ca1e3fa450 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 10 Jan 2013 03:10:40 +0100 Subject: [PATCH] chromium: Add pulse_audio_fix.patch to nixpkgs. The patch previously was fetched from an Arch Linux contributor but is no longer available there anymore. So, this is only an intermediate fix until channels get updated (very soon I hope, even though chromium 25 could get quite messy). Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 6 ++---- .../browsers/chromium/pulse_audio_fix.patch | 11 +++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 30234c92f6b1..44c283cc75fa 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -79,10 +79,8 @@ let post23 = !versionOlder sourceInfo.version "24.0.0.0"; post24 = !versionOlder sourceInfo.version "25.0.0.0"; - maybeFixPulseAudioBuild = optional (post23 && pulseSupport) (fetchurl { - url = http://archrepo.jeago.com/sources/chromium-dev/pulse_audio_fix.patch; - sha256 = "1w91mirrkqigdhsj892mqxlc0nlv1dsp5shc46w9xf8nl96jxgfb"; - }); + maybeFixPulseAudioBuild = optional (post23 && pulseSupport) + ./pulse_audio_fix.patch; in stdenv.mkDerivation rec { name = "${packageName}-${version}"; diff --git a/pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch b/pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch new file mode 100644 index 000000000000..01ff89a9a63b --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/pulse_audio_fix.patch @@ -0,0 +1,11 @@ +--- chromium-build/media/audio/pulse/pulse_output.cc.orig 2012-10-26 09:44:38.509209905 -0700 ++++ chromium-build/media/audio/pulse/pulse_output.cc 2012-10-26 09:45:32.178819603 -0700 +@@ -86,7 +86,7 @@ + + // All channel maps have the same size array of channel positions. + for (unsigned int channel = 0; channel != CHANNELS_MAX; ++channel) { +- int channel_position = kChannelOrderings[channel_layout][channel]; ++ int channel_position = ChannelOrder(channel_layout, static_cast(channel)); + if (channel_position > -1) { + channel_map.map[channel_position] = ChromiumToPAChannelPosition( + static_cast(channel));