From cc644d55d0eee966666ccd55298df7be42fc1166 Mon Sep 17 00:00:00 2001
From: Felix Plamper <felix.plamper@tuta.io>
Date: Mon, 10 Mar 2025 23:52:54 +0100
Subject: [PATCH 1/2] maintainers: add plamper

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b9cc3b38425e..c7e5ce5d043e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18700,6 +18700,12 @@
     github = "pladypus";
     githubId = 56337621;
   };
+  plamper = {
+    name = "Felix Plamper";
+    email = "felix.plamper@tuta.io";
+    github = "plamper";
+    githubId = 59016721;
+  };
   plchldr = {
     email = "mail@oddco.de";
     github = "plchldr";

From 589f5b5beb68b4c6c8c7f0f18197774af30542db Mon Sep 17 00:00:00 2001
From: Felix Plamper <felix.plamper@tuta.io>
Date: Mon, 10 Mar 2025 23:53:54 +0100
Subject: [PATCH 2/2] dovi-tool: init at 2.2.0

---
 pkgs/by-name/do/dovi-tool/package.nix | 55 +++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 pkgs/by-name/do/dovi-tool/package.nix

diff --git a/pkgs/by-name/do/dovi-tool/package.nix b/pkgs/by-name/do/dovi-tool/package.nix
new file mode 100644
index 000000000000..1c08f738a2e5
--- /dev/null
+++ b/pkgs/by-name/do/dovi-tool/package.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  fontconfig,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "dovi-tool";
+  version = "2.2.0";
+
+  src = fetchFromGitHub {
+    owner = "quietvoid";
+    repo = "dovi_tool";
+    tag = finalAttrs.version;
+    hash = "sha256-z783L6gBr9o44moKYZGwymWEMp5ZW7yOhZcpvbznXK4=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-pwB6QBLeHALbYZHzTBm/ODLPHhxM3B5n+B/0iXYNuVc=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    fontconfig
+  ];
+
+  checkFlags = [
+    # fails because nix-store is read only
+    "--skip=rpu::plot::plot_p7"
+  ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgram = "${placeholder "out"}/bin/dovi_tool";
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "CLI tool combining multiple utilities for working with Dolby Vision";
+    homepage = "https://github.com/quietvoid/dovi_tool";
+    changelog = "https://github.com/quietvoid/dovi_tool/releases";
+    mainProgram = "dovi_tool";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ plamper ];
+  };
+})