commit
0e8d2725dc
@ -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
|
@ -0,0 +1,33 @@ |
||||
{ stdenv, fetchgit, vlc, autoconf, automake, libtool, pkgconfig, npapi_sdk, |
||||
libxcb, xlibsWrapper, gtk}: |
||||
|
||||
with stdenv.lib; |
||||
|
||||
stdenv.mkDerivation rec { |
||||
name = "vlc-plugin-${version}"; |
||||
version = "2.2.2"; # This 2.2.2 builds fine with vlc 2.2.4 |
||||
|
||||
src = fetchgit { |
||||
url = "https://code.videolan.org/videolan/npapi-vlc.git"; |
||||
rev = "5fa6fbc11cf5bad983f57656c0085e47e18fbf20"; |
||||
sha256 = "18fbiy4r8rlw4fsgcxgzhi6qi9r48d0rmnp8hs994w2p94fa8kwd"; |
||||
}; |
||||
|
||||
preConfigure = "sh autogen.sh"; |
||||
|
||||
buildInputs = [ vlc autoconf automake libtool pkgconfig npapi_sdk libxcb |
||||
xlibsWrapper gtk ]; |
||||
|
||||
enableParallelBuilding = true; |
||||
|
||||
passthru = { |
||||
mozillaPlugin = "/lib/mozilla/plugins"; |
||||
}; |
||||
|
||||
meta = with stdenv.lib; { |
||||
description = "Webplugins based on libVLC (for firefox, npapi)"; |
||||
homepage = https://code.videolan.org/videolan/npapi-vlc; |
||||
platforms = platforms.linux; |
||||
license = licenses.gpl2Plus; |
||||
}; |
||||
} |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue