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

Merge pull request #86214 from elohmeier/obs

Browse Source 
obs-studio: 25.0.3 -> 25.0.8, use addOpenGLRunpath
This commit is contained in:
Florian Klink 2020-05-17 23:07:28 +02:00 committed by GitHub
commit 0878903e35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/video/obs-studio/default.nix
View File

@ -1,6 +1,7 @@
{ config, stdenv { config, stdenv
, mkDerivation , mkDerivation
, fetchFromGitHub , fetchFromGitHub
, addOpenGLRunpath
, cmake , cmake
, fdk_aac , fdk_aac
, ffmpeg , ffmpeg
@ -37,16 +38,16 @@ let
inherit (stdenv.lib) optional optionals; inherit (stdenv.lib) optional optionals;
in mkDerivation rec { in mkDerivation rec {
pname = "obs-studio"; pname = "obs-studio";
version = "25.0.3"; version = "25.0.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "obsproject"; owner = "obsproject";
repo = "obs-studio"; repo = "obs-studio";
rev = version; rev = version;
sha256 = "11hl3lxvbsm7ackl7qhzgy2x0jsz2dfpi2qxsf8pkp908lrh3b3r"; sha256 = "0j2k65q3wfyfxhvkl6icz4qy0s3kfqhksizy2i3ah7yml266axbj";
}; };
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ];
buildInputs = [ curl buildInputs = [ curl
fdk_aac fdk_aac
@ -80,6 +81,11 @@ in mkDerivation rec {
--prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${vlc}/lib" --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${vlc}/lib"
''; '';
postFixup = stdenv.lib.optionalString stdenv.isLinux ''
addOpenGLRunpath $out/lib/lib*.so
addOpenGLRunpath $out/lib/obs-plugins/*.so
'';
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 = ''