From c6c77e819f08fdf57a56fe20330ffa28133ed6dd Mon Sep 17 00:00:00 2001 From: Cleeyv Date: Thu, 23 Sep 2021 20:57:08 -0400 Subject: jibri: add section to xorg conf file, for module This change is adapted from a different jibri package, written by @puckipedia for nixcon-video-infra 2020 along with a module for jibri. Co-authored-by: Puck Meerburg --- pkgs/servers/jibri/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'pkgs/servers/jibri') diff --git a/pkgs/servers/jibri/default.nix b/pkgs/servers/jibri/default.nix index 91d6a7ddf0401..d7eb30662b54c 100644 --- a/pkgs/servers/jibri/default.nix +++ b/pkgs/servers/jibri/default.nix @@ -1,5 +1,16 @@ -{ lib, stdenv, fetchurl, dpkg, jre_headless, makeWrapper }: +{ lib, stdenv, fetchurl, dpkg, jre_headless, makeWrapper, writeText, xorg }: + +let + xorgModulePaths = writeText "module-paths" '' + Section "Files" + ModulePath "${xorg.xorgserver}/lib/xorg/modules + ModulePath "${xorg.xorgserver}/lib/xorg/extensions + ModulePath "${xorg.xorgserver}/lib/xorg/drivers + ModulePath "${xorg.xf86videodummy}/lib/xorg/modules/drivers + EndSection + ''; +in stdenv.mkDerivation rec { pname = "jibri"; version = "8.0-93-g51fe7a2"; @@ -19,6 +30,8 @@ stdenv.mkDerivation rec { mv etc/jitsi/jibri/* $out/etc/jitsi/jibri/ mv opt/jitsi/jibri/* $out/opt/jitsi/jibri/ + cat '${xorgModulePaths}' >> $out/etc/jitsi/jibri/xorg-video-dummy.conf + makeWrapper ${jre_headless}/bin/java $out/bin/jibri --add-flags "-jar $out/opt/jitsi/jibri/jibri.jar" runHook postInstall -- cgit 1.4.1