diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2012-10-08 07:04:47 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2012-10-08 07:33:52 +0200 |
| commit | 10679a7ba6bb92779f7d24b7ac5682e6497934b2 (patch) | |
| tree | 511095708a6ffeb10b215342265d51990c0294b3 /pkgs/applications | |
| parent | df64adc2dfbfc2e32319799ef713ecef5976d847 (diff) | |
| download | nixlib-10679a7ba6bb92779f7d24b7ac5682e6497934b2.tar nixlib-10679a7ba6bb92779f7d24b7ac5682e6497934b2.tar.gz nixlib-10679a7ba6bb92779f7d24b7ac5682e6497934b2.tar.bz2 nixlib-10679a7ba6bb92779f7d24b7ac5682e6497934b2.tar.lz nixlib-10679a7ba6bb92779f7d24b7ac5682e6497934b2.tar.xz nixlib-10679a7ba6bb92779f7d24b7ac5682e6497934b2.tar.zst nixlib-10679a7ba6bb92779f7d24b7ac5682e6497934b2.zip | |
chromium: Fix chromium bug 149834 for version 23.
This is just a temporary fix and will only thrown away as soon as a proper fix is included upstream, see http://crbug.com/149834 for more details about this. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 62ceb2dfb9be..1a1030606cfa 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -87,6 +87,14 @@ let else if pre23 then ./enable_seccomp22.patch else ./enable_seccomp23.patch; + maybeBpfTemporaryFix = let + patch = fetchurl { + url = "https://chromiumcodereview.appspot.com/download/issue11032056_1_2.diff"; + sha256 = "eb13dc627940ad56939837ad1093b2c388f6cf79f1f25cdc1b2e25e987c73d1c"; + }; + needPatch = !versionOlder sourceInfo.version "23.0.1271.0"; + in optional needPatch patch; + in stdenv.mkDerivation rec { name = "${packageName}-${version}"; packageName = "chromium"; @@ -120,7 +128,8 @@ in stdenv.mkDerivation rec { patches = optional (!cfg.selinux) seccompPatch ++ optional cfg.cups ./cups_allow_deprecated.patch - ++ optional cfg.pulseaudio ./pulseaudio_array_bounds.patch; + ++ optional cfg.pulseaudio ./pulseaudio_array_bounds.patch + ++ maybeBpfTemporaryFix; postPatch = optionalString cfg.openssl '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl |