summary refs log tree commit diff
path: root/pkgs/development/libraries/libcef/default.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2019-10-28 20:47:50 +0100
committerPeter Simons <simons@cryp.to>2019-10-28 21:19:27 +0100
commit6597ad2ae53bb86316190aef2399f34db23902b7 (patch)
treedfdac628370cad32d72a1018dce74831a91c45d5 /pkgs/development/libraries/libcef/default.nix
parent3e639196de915247f71f3395c53ee2f52d472d34 (diff)
downloadnixpkgs-6597ad2ae53bb86316190aef2399f34db23902b7.tar
nixpkgs-6597ad2ae53bb86316190aef2399f34db23902b7.tar.gz
nixpkgs-6597ad2ae53bb86316190aef2399f34db23902b7.tar.bz2
nixpkgs-6597ad2ae53bb86316190aef2399f34db23902b7.tar.lz
nixpkgs-6597ad2ae53bb86316190aef2399f34db23902b7.tar.xz
nixpkgs-6597ad2ae53bb86316190aef2399f34db23902b7.tar.zst
nixpkgs-6597ad2ae53bb86316190aef2399f34db23902b7.zip
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
Diffstat (limited to 'pkgs/development/libraries/libcef/default.nix')
-rw-r--r--pkgs/development/libraries/libcef/default.nix16
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index e01142c12ef..be418125dfb 100644
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/pkgs/development/libraries/libcef/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, cmake, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
 , GConf, gdk-pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor
 , 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
   libPath =
@@ -9,20 +10,24 @@ let
       alsaLib atk cairo cups dbus expat fontconfig GConf gdk-pixbuf glib gtk2
       libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi
       libXrandr libXrender libXScrnSaver libXtst nspr nss pango libpulseaudio
-      systemd
+      systemd at-spi2-core at-spi2-atk
     ];
 in
 stdenv.mkDerivation rec {
   pname = "cef-binary";
-  version = "3.3497.1833.g13f506f";
+  version = "74.1.14-g50c3c5c";
+
   src = fetchurl {
-    url = "http://opensource.spotify.com/cefbuilds/cef_binary_${version}_linux64.tar.bz2";
-    sha256 = "02v22yx1ga2yxagjblzkfw0ax7zkrdpc959l1a15m8nah3y7xf9p";
+    name = "cef_binary_74.1.14+g50c3c5c+chromium-74.0.3729.131_linux64_minimal.tar.bz2";
+    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 ];
   makeFlags = "libcef_dll_wrapper";
   dontStrip = true;
   dontPatchELF = true;
+
   installPhase = ''
     mkdir -p $out/lib/ $out/share/cef/
     cp libcef_dll_wrapper/libcef_dll_wrapper.a $out/lib/
@@ -39,6 +44,5 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ puffnfresh ];
     license = licenses.bsd3;
     platforms = with platforms; linux;
-    broken = true;
   };
 }