public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chromium: fix "Aw, snap!" after glibc 2.24 upgrade 

See https://bugzilla.redhat.com/show_bug.cgi?id=1361157#c8
cc @domenkozar @aszlig
This commit is contained in:
obadz 2016-08-23 11:56:11 +01:00
parent 08933f8a07
commit cd063d774e
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -128,6 +128,7 @@ let
patches = [ patches = [
./patches/widevine.patch ./patches/widevine.patch
./patches/glibc-2.24.patch
(if versionOlder version "52.0.0.0" (if versionOlder version "52.0.0.0"
then ./patches/nix_plugin_paths_50.patch then ./patches/nix_plugin_paths_50.patch
else ./patches/nix_plugin_paths_52.patch) else ./patches/nix_plugin_paths_52.patch)

14
pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch Normal file
View File

@ -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