public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #72190 from peti/t/obs-linuxbrowser

Browse Source 
Fix build of obs-linuxbrowser
This commit is contained in:
Peter Simons 2019-10-28 21:58:09 +01:00 committed by GitHub
commit 3e13d5ed52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/video/obs-studio/linuxbrowser.nix
View File

@ -5,18 +5,19 @@
# mkdir -p ~/.config/obs-studio/plugins # mkdir -p ~/.config/obs-studio/plugins
# ln -s ~/.nix-profile/share/obs/obs-plugins/obs-linuxbrowser ~/.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 { stdenv.mkDerivation rec {
pname = "obs-linuxbrowser"; pname = "obs-linuxbrowser";
version = "0.6.1"; version = "0.6.1-6-gf86dba6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bazukas"; owner = "bazukas";
repo = "obs-linuxbrowser"; repo = "obs-linuxbrowser";
rev = version; rev = version;
sha256 = "1mi9pchy07ipnx1m2767n29d53v822yajcf6c3705dhz882z21zq"; sha256 = "08d7qz0721va88bcyia8p0ycw50f6x3yk97s3vzhsc9xpq691kpi";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ obs-studio ]; buildInputs = [ obs-studio ];
postUnpack = '' postUnpack = ''
@ -44,6 +45,5 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ puffnfresh ]; maintainers = with maintainers; [ puffnfresh ];
license = licenses.gpl2; license = licenses.gpl2;
platforms = with platforms; linux; platforms = with platforms; linux;
broken = true;
}; };
} }

16
pkgs/development/libraries/libcef/default.nix
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;
}; };
} }