diff options
| author | Will Dietz <w@wdtz.org> | 2017-09-04 09:56:34 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-13 09:44:48 -0600 |
| commit | e1e6e94c5de064b5573f9bc9efbe0b9b679d9c0f (patch) | |
| tree | b4fb3738dbb99d4831e082eecd625b72864c6e70 | |
| parent | 8dfe068f862a3b2e336a246655000aa73949201d (diff) | |
| download | nixpkgs-e1e6e94c5de064b5573f9bc9efbe0b9b679d9c0f.tar nixpkgs-e1e6e94c5de064b5573f9bc9efbe0b9b679d9c0f.tar.gz nixpkgs-e1e6e94c5de064b5573f9bc9efbe0b9b679d9c0f.tar.bz2 nixpkgs-e1e6e94c5de064b5573f9bc9efbe0b9b679d9c0f.tar.lz nixpkgs-e1e6e94c5de064b5573f9bc9efbe0b9b679d9c0f.tar.xz nixpkgs-e1e6e94c5de064b5573f9bc9efbe0b9b679d9c0f.tar.zst nixpkgs-e1e6e94c5de064b5573f9bc9efbe0b9b679d9c0f.zip | |
webkitgtk: Add musl patch from Alpine re:execinfo, use libc++ on ALLVM
| -rw-r--r-- | pkgs/development/libraries/webkitgtk/2.4.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/webkitgtk/fix-execinfo.patch | 20 |
2 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 6669b562400..18d20bf9c78 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -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; [ diff --git a/pkgs/development/libraries/webkitgtk/fix-execinfo.patch b/pkgs/development/libraries/webkitgtk/fix-execinfo.patch new file mode 100644 index 00000000000..eb825312f3b --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/fix-execinfo.patch @@ -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 |