diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-23 11:56:11 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-23 11:56:11 +0100 |
| commit | cd063d774e5f4981fa4949b1ce8510c641b491a9 (patch) | |
| tree | 5a96d4d785123f0266de107131895b016263f0d2 /pkgs/applications | |
| parent | 08933f8a07ce2ca1ae5ebadb43535432aa5c2330 (diff) | |
chromium: fix "Aw, snap!" after glibc 2.24 upgrade
See https://bugzilla.redhat.com/show_bug.cgi?id=1361157#c8 cc @domenkozar @aszlig
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 2c70978a4962e..a1110fa07a86b 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 0000000000000..10a04b7ec8dc3 --- /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 <errno.h> + #include <sys/mman.h> + ++#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 |