From 920bc7a2fd6b87fd41414aaf508521e0ede4c60c Mon Sep 17 00:00:00 2001
From: tropf <tropf@users.noreply.github.com>
Date: Thu, 12 Oct 2023 14:02:04 +0200
Subject: [PATCH] xvfb-run: only set fontconfig if not specified

Nix injects the environment variable FONTCONFIG_PATH to xvfb-run, in
order to provide some miminmal font support to applications via
fontconfig.

This change only sets this environment variable if it is not given
already. This allows the user to inject their own font configuration,
i.e. allows them to make extra fonts available to the executed
application.

If not set, the minimal font configuration will still be provided.
---
 pkgs/tools/misc/xvfb-run/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix
index fc87723208ed..eb1e7c5b01b7 100644
--- a/pkgs/tools/misc/xvfb-run/default.nix
+++ b/pkgs/tools/misc/xvfb-run/default.nix
@@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation rec {
     chmod a+x $out/bin/xvfb-run
     patchShebangs $out/bin/xvfb-run
     wrapProgram $out/bin/xvfb-run \
-      --set FONTCONFIG_FILE "${fontsConf}" \
+      --set-default FONTCONFIG_FILE "${fontsConf}" \
       --prefix PATH : ${lib.makeBinPath [ getopt xorgserver xauth which util-linux gawk coreutils ]}
   '';