libcef: update to cef_binary_74.1.14+g50c3c5c+chromium-74.0.3729.131

I chose that version because [1] suggested that CEF versions before 75.x
worked, whereas newer versions don't compile due to API changes.

[1] https://github.com/bazukas/obs-linuxbrowser/issues/108#issuecomment-513544091
This commit is contained in:
Peter Simons 2019-10-28 20:47:50 +01:00
parent 3e639196de
commit 6597ad2ae5

View File

@ -1,7 +1,8 @@
{ stdenv, fetchurl, cmake, alsaLib, atk, cairo, cups, dbus, expat, fontconfig { stdenv, fetchurl, cmake, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
, GConf, gdk-pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor , GConf, gdk-pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor
, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver , libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver
, libXtst, nspr, nss, pango, libpulseaudio, systemd }: , libXtst, nspr, nss, pango, libpulseaudio, systemd, at-spi2-atk, at-spi2-core
}:
let let
libPath = libPath =
@ -9,20 +10,24 @@ let
alsaLib atk cairo cups dbus expat fontconfig GConf gdk-pixbuf glib gtk2 alsaLib atk cairo cups dbus expat fontconfig GConf gdk-pixbuf glib gtk2
libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi
libXrandr libXrender libXScrnSaver libXtst nspr nss pango libpulseaudio libXrandr libXrender libXScrnSaver libXtst nspr nss pango libpulseaudio
systemd systemd at-spi2-core at-spi2-atk
]; ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cef-binary"; pname = "cef-binary";
version = "3.3497.1833.g13f506f"; version = "74.1.14-g50c3c5c";
src = fetchurl { src = fetchurl {
url = "http://opensource.spotify.com/cefbuilds/cef_binary_${version}_linux64.tar.bz2"; name = "cef_binary_74.1.14+g50c3c5c+chromium-74.0.3729.131_linux64_minimal.tar.bz2";
sha256 = "02v22yx1ga2yxagjblzkfw0ax7zkrdpc959l1a15m8nah3y7xf9p"; url = "http://opensource.spotify.com/cefbuilds/cef_binary_74.1.19%2Bgb62bacf%2Bchromium-74.0.3729.157_linux64_minimal.tar.bz2";
sha256 = "0v3540kq4y68gq7mb4d8a9issm363lm5ngrd6d96pcc7vckkw4wn";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
makeFlags = "libcef_dll_wrapper"; makeFlags = "libcef_dll_wrapper";
dontStrip = true; dontStrip = true;
dontPatchELF = true; dontPatchELF = true;
installPhase = '' installPhase = ''
mkdir -p $out/lib/ $out/share/cef/ mkdir -p $out/lib/ $out/share/cef/
cp libcef_dll_wrapper/libcef_dll_wrapper.a $out/lib/ cp libcef_dll_wrapper/libcef_dll_wrapper.a $out/lib/
@ -39,6 +44,5 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ puffnfresh ]; maintainers = with maintainers; [ puffnfresh ];
license = licenses.bsd3; license = licenses.bsd3;
platforms = with platforms; linux; platforms = with platforms; linux;
broken = true;
}; };
} }