From 6597ad2ae53bb86316190aef2399f34db23902b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Oct 2019 20:47:50 +0100
Subject: [PATCH 1/2] 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
---
pkgs/development/libraries/libcef/default.nix | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index e01142c12efe..be418125dfbb 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;
};
}
From fadb0090e04d3cb6a032f730562526f44e27aa85 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Oct 2019 20:50:20 +0100
Subject: [PATCH 2/2] obs-linuxbrowser: update to latest 'master' version from
Github
The version number corresponds to "git describe --tags".
---
pkgs/applications/video/obs-studio/linuxbrowser.nix | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix
index 4761cd0e50a3..134e0cb8a9e3 100644
--- a/pkgs/applications/video/obs-studio/linuxbrowser.nix
+++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix
@@ -5,18 +5,19 @@
# mkdir -p ~/.config/obs-studio/plugins
# ln -s ~/.nix-profile/share/obs/obs-plugins/obs-linuxbrowser ~/.config/obs-studio/plugins/
-{ stdenv, fetchFromGitHub, obs-studio, cmake, libcef
-}:
+{ stdenv, fetchFromGitHub, obs-studio, cmake, libcef }:
stdenv.mkDerivation rec {
pname = "obs-linuxbrowser";
- version = "0.6.1";
+ version = "0.6.1-6-gf86dba6";
+
src = fetchFromGitHub {
owner = "bazukas";
repo = "obs-linuxbrowser";
rev = version;
- sha256 = "1mi9pchy07ipnx1m2767n29d53v822yajcf6c3705dhz882z21zq";
+ sha256 = "08d7qz0721va88bcyia8p0ycw50f6x3yk97s3vzhsc9xpq691kpi";
};
+
nativeBuildInputs = [ cmake ];
buildInputs = [ obs-studio ];
postUnpack = ''
@@ -44,6 +45,5 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ puffnfresh ];
license = licenses.gpl2;
platforms = with platforms; linux;
- broken = true;
};
}