From 08ebc6c0b25bf025a2809887e61c591aa25b59e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Sat, 11 Jul 2026 20:43:12 +0700
Subject: [PATCH] =?UTF-8?q?displaycal:=203.9.17=20=E2=86=92=203.9.18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/di/displaycal/package.nix | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/di/displaycal/package.nix b/pkgs/by-name/di/displaycal/package.nix
index a7422310e414..c6cc6cfec6e9 100644
--- a/pkgs/by-name/di/displaycal/package.nix
+++ b/pkgs/by-name/di/displaycal/package.nix
@@ -15,13 +15,13 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "displaycal";
-  version = "3.9.17";
+  version = "3.9.18";
   pyproject = true;
 
   src = fetchPypi {
-    pname = "DisplayCAL";
+    pname = "displaycal";
     inherit (finalAttrs) version;
-    hash = "sha256-cV8x1Hx+KQUhOOzqw/89QgoZ9+82vhwGrhG13KpE9Vw=";
+    hash = "sha256-mHUtO3vVIREzcIv6IFmPlo4nwuPPGDd9+UbIoXfvLYo=";
   };
 
   nativeBuildInputs = [
@@ -29,17 +29,30 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     gtk3
   ];
 
-  build-system = with python3.pkgs; [ setuptools ];
+  build-system = with python3.pkgs; [ setuptools_80 ];
+
+  postPatch = ''
+    # 2 conflicting copies of bin/displaycal end up from the installation
+    # process (one from pyproject.toml’s gui-scripts, one from setup.py). Keep
+    # only the setup.py version. Replace key with an invalide name to be
+    # skipped.
+    substituteInPlace pyproject.toml \
+      --replace-fail "[project.gui-scripts]" "[_project.gui-scripts]" \
+  '';
 
   dependencies = with python3.pkgs; [
     build
     certifi
+    defusedxml
     wxpython
     dbus-python
     distro
     numpy
     pillow
+    psutil
     pychromecast
+    pyglet
+    pyyaml
     send2trash
     zeroconf
   ];