From d9e2937de3e4319919d03a3e40c3c2adb1cf9f57 Mon Sep 17 00:00:00 2001
From: Alex James <git@alextjam.es>
Date: Wed, 4 Jun 2025 20:49:55 -0500
Subject: [PATCH 1/3] =?UTF-8?q?dovi-tool:=202.2.0=20=E2=86=92=202.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changelog: https://github.com/quietvoid/dovi_tool/releases/tag/2.3.1
---
 pkgs/by-name/do/dovi-tool/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/do/dovi-tool/package.nix b/pkgs/by-name/do/dovi-tool/package.nix
index c39a26409531..97749ac7b2b0 100644
--- a/pkgs/by-name/do/dovi-tool/package.nix
+++ b/pkgs/by-name/do/dovi-tool/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dovi-tool";
-  version = "2.2.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "quietvoid";
     repo = "dovi_tool";
     tag = finalAttrs.version;
-    hash = "sha256-z783L6gBr9o44moKYZGwymWEMp5ZW7yOhZcpvbznXK4=";
+    hash = "sha256-4C9d8Rt1meV6Pcdnf2SaiWGA97sRj2WmvKsf1rC01Bs=";
   };
 
-  cargoHash = "sha256-pwB6QBLeHALbYZHzTBm/ODLPHhxM3B5n+B/0iXYNuVc=";
+  cargoHash = "sha256-Dg6IDcYm3qTSyE5kVgZ8Yka8538KDFyBN+weUyAfQT8=";
 
   nativeBuildInputs = [
     pkg-config

From d7c8d487cacf0eaa2b773b5d33e4102a2f63cc04 Mon Sep 17 00:00:00 2001
From: Alex James <git@alextjam.es>
Date: Wed, 4 Jun 2025 22:22:28 -0500
Subject: [PATCH 2/3] dovi-tool: avoid `pkg-config`/`fontconfig` on Darwin

---
 pkgs/by-name/do/dovi-tool/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/do/dovi-tool/package.nix b/pkgs/by-name/do/dovi-tool/package.nix
index 97749ac7b2b0..a70df3e456dc 100644
--- a/pkgs/by-name/do/dovi-tool/package.nix
+++ b/pkgs/by-name/do/dovi-tool/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
   pkg-config,
@@ -21,11 +22,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-Dg6IDcYm3qTSyE5kVgZ8Yka8538KDFyBN+weUyAfQT8=";
 
-  nativeBuildInputs = [
+  nativeBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
     pkg-config
   ];
 
-  buildInputs = [
+  buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
     fontconfig
   ];
 

From 5e4f04ac55444f215ea56829dda7fc773377769c Mon Sep 17 00:00:00 2001
From: Alex James <git@alextjam.es>
Date: Thu, 5 Jun 2025 00:03:40 -0500
Subject: [PATCH 3/3] dovi-tool: enable rpu::plot::plot_p7 test

---
 pkgs/by-name/do/dovi-tool/package.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/do/dovi-tool/package.nix b/pkgs/by-name/do/dovi-tool/package.nix
index a70df3e456dc..b3b8244785a8 100644
--- a/pkgs/by-name/do/dovi-tool/package.nix
+++ b/pkgs/by-name/do/dovi-tool/package.nix
@@ -5,10 +5,16 @@
   fetchFromGitHub,
   pkg-config,
   fontconfig,
+  makeFontsConf,
   versionCheckHook,
   nix-update-script,
 }:
 
+let
+  fontsConf = makeFontsConf {
+    fontDirectories = [ ];
+  };
+in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dovi-tool";
   version = "2.3.1";
@@ -30,9 +36,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
     fontconfig
   ];
 
-  checkFlags = [
-    # fails because nix-store is read only
-    "--skip=rpu::plot::plot_p7"
+  preCheck = lib.optionals (!stdenv.hostPlatform.isDarwin) ''
+    # Fontconfig error: Cannot load default config file: No such file: (null)
+    export FONTCONFIG_FILE="${fontsConf}"
+    # Fontconfig error: No writable cache directories
+    export XDG_CACHE_HOME="$(mktemp -d)"
+  '';
+
+  # Needed for rpu::plot::plot_p7 to pass in the sandbox.
+  __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [
+    "/System/Library/Fonts/Supplemental/Arial.ttf"
   ];
 
   nativeInstallCheckInputs = [