@@ -1,26 +1,66 @@
1−{ lib, stdenv, fetchurl, cmake, alsa-lib, atk, cairo, cups, dbus, expat, fontconfig
2−, GConf, gdk-pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor
3−, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver
4−, libXtst, nspr, nss, pango, libpulseaudio, systemd, at-spi2-atk, at-spi2-core
1+{ lib, stdenv, fetchurl, cmake
2+, glib
3+, nss
4+, nspr
5+, atk
6+, at-spi2-atk
7+, libdrm
8+, expat
9+, libxcb
10+, libxkbcommon
11+, libX11
12+, libXcomposite
13+, libXdamage
14+, libXext
15+, libXfixes
16+, libXrandr
17+, mesa
18+, gtk3
19+, pango
20+, cairo
21+, alsa-lib
22+, dbus
23+, at-spi2-core
24+, cups
25+, libxshmfence
526}:
627
728let
8− libPath =
9− lib.makeLibraryPath [
10− alsa-lib atk cairo cups dbus expat fontconfig GConf gdk-pixbuf glib gtk2
11− libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi
12− libXrandr libXrender libXScrnSaver libXtst nspr nss pango libpulseaudio
13− systemd at-spi2-core at-spi2-atk
14− ];
15−in
16−stdenv.mkDerivation rec {
29+ rpath = lib.makeLibraryPath [
30+ glib
31+ nss
32+ nspr
33+ atk
34+ at-spi2-atk
35+ libdrm
36+ expat
37+ libxcb
38+ libxkbcommon
39+ libX11
40+ libXcomposite
41+ libXdamage
42+ libXext
43+ libXfixes
44+ libXrandr
45+ mesa
46+ gtk3
47+ pango
48+ cairo
49+ alsa-lib
50+ dbus
51+ at-spi2-core
52+ cups
53+ libxshmfence
54+ ];
55+in stdenv.mkDerivation rec {
1756 pname = "cef-binary";
18− version = "75.1.14-gc81164e";
57+ version = "90.6.7";
58+ gitRevision = "19ba721";
59+ chromiumVersion = "90.0.4430.212";
1960
2061 src = fetchurl {
21− name = "cef_binary_75.1.14+gc81164e+chromium-75.0.3770.100_linux64_minimal.tar.bz2";
22− url = "http://opensource.spotify.com/cefbuilds/cef_binary_75.1.14%2Bgc81164e%2Bchromium-75.0.3770.100_linux64_minimal.tar.bz2";
23− sha256 = "0985b2bx505j0q693hifjgidzb597wqf5idql5aqxs8lfxhc2pgg";
62+ url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_linux64_minimal.tar.bz2";
63+ sha256 = "1ja711x9fdlf21qw1k9xn3lvjc5zsfgnjga1w1r8sysam73jk7xj";
2464 };
2565
2666 nativeBuildInputs = [ cmake ];
@@ -32,7 +72,7 @@ stdenv.mkDerivation rec {
3272 mkdir -p $out/lib/ $out/share/cef/
3373 cp libcef_dll_wrapper/libcef_dll_wrapper.a $out/lib/
3474 cp ../Release/libcef.so $out/lib/
35− patchelf --set-rpath "${libPath}" $out/lib/libcef.so
75+ patchelf --set-rpath "${rpath}" $out/lib/libcef.so
3676 cp ../Release/*.bin $out/share/cef/
3777 cp -r ../Resources/* $out/share/cef/
3878 cp -r ../include $out/
@@ -40,7 +80,7 @@ stdenv.mkDerivation rec {
4080
4181 meta = with lib; {
4282 description = "Simple framework for embedding Chromium-based browsers in other applications";
43− homepage = "http://opensource.spotify.com/cefbuilds/index.html";
83+ homepage = "https://cef-builds.spotifycdn.com/index.html";
4484 maintainers = with maintainers; [ puffnfresh ];
4585 license = licenses.bsd3;
4686 platforms = with platforms; linux;