From c167fbb3eaa36a080fdfcb1cae6adbf4b72e6721 Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Tue, 28 Apr 2020 16:04:41 +0200 Subject: [PATCH 1/2] obs-studio: use addOpenGLRunpath to enable nvenc --- pkgs/applications/video/obs-studio/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index be2a323943d..ceee3d022be 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -1,6 +1,7 @@ { config, stdenv , mkDerivation , fetchFromGitHub +, addOpenGLRunpath , cmake , fdk_aac , ffmpeg @@ -46,7 +47,7 @@ in mkDerivation rec { sha256 = "11hl3lxvbsm7ackl7qhzgy2x0jsz2dfpi2qxsf8pkp908lrh3b3r"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ]; buildInputs = [ curl fdk_aac @@ -80,6 +81,10 @@ in mkDerivation rec { --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${vlc}/lib" ''; + postFixup = stdenv.lib.optionalString stdenv.isLinux '' + addOpenGLRunpath $out/lib/lib*.so + ''; + meta = with stdenv.lib; { description = "Free and open source software for video recording and live streaming"; longDescription = '' From a311224450cd986ba297364b26848c09b87cdbe3 Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Tue, 28 Apr 2020 16:08:13 +0200 Subject: [PATCH 2/2] obs-studio: 25.0.3 -> 25.0.8 --- pkgs/applications/video/obs-studio/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index ceee3d022be..45ebf0beb44 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -38,13 +38,13 @@ let inherit (stdenv.lib) optional optionals; in mkDerivation rec { pname = "obs-studio"; - version = "25.0.3"; + version = "25.0.8"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "11hl3lxvbsm7ackl7qhzgy2x0jsz2dfpi2qxsf8pkp908lrh3b3r"; + sha256 = "0j2k65q3wfyfxhvkl6icz4qy0s3kfqhksizy2i3ah7yml266axbj"; }; nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ]; @@ -83,6 +83,7 @@ in mkDerivation rec { postFixup = stdenv.lib.optionalString stdenv.isLinux '' addOpenGLRunpath $out/lib/lib*.so + addOpenGLRunpath $out/lib/obs-plugins/*.so ''; meta = with stdenv.lib; {