nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 16:03:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

webkitgtk: Add musl patch from Alpine re:execinfo, use libc++ on ALLVM

Browse Source
This commit is contained in:
Will Dietz 2017-09-04 09:56:34 -05:00
parent 8dfe068f86
commit e1e6e94c5d
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/webkitgtk/2.4.nix
View File

@ -53,6 +53,8 @@ stdenv.mkDerivation rec {
./quartz-webcore.patch
./libc++.patch
./plugin-none.patch
] ++ optionals stdenv.hostPlatform.isMusl [
./fix-execinfo.patch
];
configureFlags = with stdenv.lib; [

20
pkgs/development/libraries/webkitgtk/fix-execinfo.patch Normal file
View File

@ -0,0 +1,20 @@
--- webkitgtk-2.2.0.orig/Source/WTF/wtf/Assertions.cpp
+++ webkitgtk-2.2.0/Source/WTF/wtf/Assertions.cpp
@@ -64,7 +64,7 @@
#include <windows.h>
#endif
-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
#include <cxxabi.h>
#include <dlfcn.h>
#include <execinfo.h>
@@ -242,7 +242,7 @@
void WTFGetBacktrace(void** stack, int* size)
{
-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
*size = backtrace(stack, *size);
#elif OS(WINDOWS) && !OS(WINCE)
// The CaptureStackBackTrace function is available in XP, but it is not defined