obs-studio: libX11.so was missing at runtime

This commit is contained in:
Rok Garbas 2016-07-25 04:19:32 +02:00
parent 0b7472f59f
commit b8ab178e4c
No known key found for this signature in database
GPG Key ID: A0E01EF44C27BF00
1 changed files with 10 additions and 2 deletions

View File

@ -9,6 +9,8 @@
, libv4l , libv4l
, x264 , x264
, curl , curl
, xorg
, makeWrapper
, alsaSupport ? false , alsaSupport ? false
, alsaLib , alsaLib
@ -20,13 +22,13 @@ let
optional = stdenv.lib.optional; optional = stdenv.lib.optional;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "obs-studio-${version}"; name = "obs-studio-${version}";
version = "0.14.2"; version = "0.15.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jp9000"; owner = "jp9000";
repo = "obs-studio"; repo = "obs-studio";
rev = "${version}"; rev = "${version}";
sha256 = "05yjm58d6daya1x6v8d73gx8fb20l0icay74nx0v4si2c898vm1j"; sha256 = "0vw203a1zj2npras589ml6gr5s11h9bhaica90plrh5ajayg0qwj";
}; };
nativeBuildInputs = [ cmake nativeBuildInputs = [ cmake
@ -40,6 +42,7 @@ in stdenv.mkDerivation rec {
qtbase qtbase
qtx11extras qtx11extras
x264 x264
makeWrapper
] ]
++ optional alsaSupport alsaLib ++ optional alsaSupport alsaLib
++ optional pulseaudioSupport libpulseaudio; ++ optional pulseaudioSupport libpulseaudio;
@ -49,6 +52,11 @@ in stdenv.mkDerivation rec {
# to handle this. # to handle this.
cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-DDL_OPENGL=\\\"$(out)/lib/libobs-opengl.so\\\"" ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-DDL_OPENGL=\\\"$(out)/lib/libobs-opengl.so\\\"" ];
postInstall = ''
wrapProgram $out/bin/obs \
--prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Free and open source software for video recording and live streaming"; description = "Free and open source software for video recording and live streaming";
longDescription = '' longDescription = ''