From cd063d774e5f4981fa4949b1ce8510c641b491a9 Mon Sep 17 00:00:00 2001 From: obadz Date: Tue, 23 Aug 2016 11:56:11 +0100 Subject: [PATCH] chromium: fix "Aw, snap!" after glibc 2.24 upgrade See https://bugzilla.redhat.com/show_bug.cgi?id=1361157#c8 cc @domenkozar @aszlig --- .../networking/browsers/chromium/common.nix | 1 + .../browsers/chromium/patches/glibc-2.24.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 2c70978a496..a1110fa07a8 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -128,6 +128,7 @@ let patches = [ ./patches/widevine.patch + ./patches/glibc-2.24.patch (if versionOlder version "52.0.0.0" then ./patches/nix_plugin_paths_50.patch else ./patches/nix_plugin_paths_52.patch) diff --git a/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch b/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch new file mode 100644 index 00000000000..10a04b7ec8d --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch @@ -0,0 +1,14 @@ +--- old/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-03 21:02:37.000000000 +0200 ++++ new/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-14 10:59:51.395354850 +0200 +@@ -41,6 +41,11 @@ + #include + #include + ++#if OS(LINUX) && defined(MADV_FREE) ++// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime ++#undef MADV_FREE ++#endif ++ + #ifndef MADV_FREE + #define MADV_FREE MADV_DONTNEED + #endif