From aa14d09fcc8ee1c10b011442bb9d759ffbdef9e9 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 23 Jul 2026 16:38:01 +0300
Subject: [PATCH 1/5] ddccontrol: substitute in configure.ac with
 --replace-fail

---
 pkgs/by-name/dd/ddccontrol/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/dd/ddccontrol/package.nix b/pkgs/by-name/dd/ddccontrol/package.nix
index 57b148c4ce92..31279ec0d5ea 100644
--- a/pkgs/by-name/dd/ddccontrol/package.nix
+++ b/pkgs/by-name/dd/ddccontrol/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   prePatch = ''
     substituteInPlace configure.ac              \
-      --replace                                 \
+      --replace-fail                            \
       "\$""{datadir}/ddccontrol-db"             \
       "${ddccontrol-db}/share/ddccontrol-db"
 

From b5eaa1ed39af378974e5bc16a20d7b57e05454cb Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 23 Jul 2026 17:50:57 +0300
Subject: [PATCH 2/5] ddccontrol: set meta.mainProgram

---
 pkgs/by-name/dd/ddccontrol/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/dd/ddccontrol/package.nix b/pkgs/by-name/dd/ddccontrol/package.nix
index 31279ec0d5ea..c0fafcdddcc6 100644
--- a/pkgs/by-name/dd/ddccontrol/package.nix
+++ b/pkgs/by-name/dd/ddccontrol/package.nix
@@ -56,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Program used to control monitor parameters by software";
     homepage = "https://github.com/ddccontrol/ddccontrol";
+    mainProgram = "ddccontrol";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [

From 85c515b33ca9ac4fe8a7dfe945ee36c0b5ed17e2 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 23 Jul 2026 16:40:29 +0300
Subject: [PATCH 3/5] ddccontrol: small formatting to prePatch

---
 pkgs/by-name/dd/ddccontrol/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dd/ddccontrol/package.nix b/pkgs/by-name/dd/ddccontrol/package.nix
index c0fafcdddcc6..a1cbaca5bbff 100644
--- a/pkgs/by-name/dd/ddccontrol/package.nix
+++ b/pkgs/by-name/dd/ddccontrol/package.nix
@@ -40,9 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   prePatch = ''
-    substituteInPlace configure.ac              \
-      --replace-fail                            \
-      "\$""{datadir}/ddccontrol-db"             \
+    substituteInPlace configure.ac \
+      --replace-fail \
+      "\$""{datadir}/ddccontrol-db" \
       "${ddccontrol-db}/share/ddccontrol-db"
 
     substituteInPlace src/ddcpci/Makefile.am    \

From 74a8d352e681df38937c4dc7a63f697f8a022aa3 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 23 Jul 2026 16:46:04 +0300
Subject: [PATCH 4/5] ddccontrol: categorize inputs

---
 pkgs/by-name/dd/ddccontrol/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/dd/ddccontrol/package.nix b/pkgs/by-name/dd/ddccontrol/package.nix
index a1cbaca5bbff..8cc71aa06291 100644
--- a/pkgs/by-name/dd/ddccontrol/package.nix
+++ b/pkgs/by-name/dd/ddccontrol/package.nix
@@ -2,11 +2,15 @@
   lib,
   stdenv,
   fetchFromGitHub,
+
+  # nativeBuildInputs
   autoreconfHook,
   intltool,
+  pkg-config,
+
+  # buildInputs
   libxml2,
   pciutils,
-  pkg-config,
   gtk2,
   ddccontrol-db,
 }:

From d8b0e9e4fe9b2773a957565d8a96e4562b13ee8b Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 23 Jul 2026 16:35:37 +0300
Subject: [PATCH 5/5] ddccontrol: 1.0.3 -> 3.2.0

Diff: https://github.com/ddccontrol/ddccontrol/compare/1.0.3...3.2.0
---
 pkgs/by-name/dd/ddccontrol/package.nix | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/dd/ddccontrol/package.nix b/pkgs/by-name/dd/ddccontrol/package.nix
index 8cc71aa06291..d5d162eb21b7 100644
--- a/pkgs/by-name/dd/ddccontrol/package.nix
+++ b/pkgs/by-name/dd/ddccontrol/package.nix
@@ -7,35 +7,46 @@
   autoreconfHook,
   intltool,
   pkg-config,
+  rustPlatform,
+  cargo,
+  rustc,
 
   # buildInputs
   libxml2,
   pciutils,
-  gtk2,
+  gtk3,
   ddccontrol-db,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ddccontrol";
-  version = "1.0.3";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "ddccontrol";
     repo = "ddccontrol";
     tag = finalAttrs.version;
-    sha256 = "sha256-qyD6i44yH3EufIW+LA/LBMW20Tejb49zvsDfv6YFD6c=";
+    sha256 = "sha256-8VqnmWLXt6rXapAqvzvtDQ9XjQ7H6s7pLqPhQ6Zflc4=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-UN308Tt9LCRLBSswem06UupjdIFntt6SqpTxteY5O78=";
   };
 
   nativeBuildInputs = [
     autoreconfHook
     intltool
     pkg-config
+    rustPlatform.cargoSetupHook
+    cargo
+    rustc
   ];
 
   buildInputs = [
     libxml2
     pciutils
-    gtk2
+    gtk3
     ddccontrol-db
   ];
 
@@ -48,9 +59,10 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail \
       "\$""{datadir}/ddccontrol-db" \
       "${ddccontrol-db}/share/ddccontrol-db"
-
-    substituteInPlace src/ddcpci/Makefile.am    \
-       --replace "chmod 4711" "chmod 0711"
+    substituteInPlace src/lib/Makefile.am \
+      --replace-fail \
+      'DDCONTROL_DATADIR="$(datadir)/ddccontrol-db"' \
+      'DDCONTROL_DATADIR="${ddccontrol-db}/share/ddccontrol-db"'
   '';
 
   preConfigure = ''