From bed56401be941001b9041a55a77a2b72aa78c2a0 Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Fri, 10 Jul 2026 17:05:01 +0200
Subject: [PATCH] arandr: fix build with setuptools 81+

---
 pkgs/by-name/ar/arandr/gzip-timestamp-fix.patch | 12 ++++++++----
 pkgs/by-name/ar/arandr/package.nix              | 15 ++++++++++++---
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ar/arandr/gzip-timestamp-fix.patch b/pkgs/by-name/ar/arandr/gzip-timestamp-fix.patch
index 7d214afb41f2..7c79bb5538c4 100644
--- a/pkgs/by-name/ar/arandr/gzip-timestamp-fix.patch
+++ b/pkgs/by-name/ar/arandr/gzip-timestamp-fix.patch
@@ -1,7 +1,8 @@
---- setup.py	2025-04-01 11:24:54.530984662 +0000
-+++ setup.py	2025-04-01 13:54:46.961341548 +0000
- 
-@@ -111,9 +111,11 @@
+diff --git a/setup.py b/setup.py
+index 6e295c8..048db19 100755
+--- a/setup.py
++++ b/setup.py
+@@ -111,9 +111,11 @@ class build_man(NoOptionCommand):
                  info('compressing man page to %s', gzfile)
  
                  if not self.dry_run:
@@ -13,3 +14,6 @@
 +                            compressed.write(manpage)
 +                            compressed.close()
 +                            file.close()
+ 
+ class update_translator_credits(NoOptionCommand):
+     description = 'Examine the git history to produce an updated metadata file.'
diff --git a/pkgs/by-name/ar/arandr/package.nix b/pkgs/by-name/ar/arandr/package.nix
index f6216fb4f820..2cb647278440 100644
--- a/pkgs/by-name/ar/arandr/package.nix
+++ b/pkgs/by-name/ar/arandr/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitLab,
+  fetchpatch,
   python3Packages,
   gobject-introspection,
   gsettings-desktop-schemas,
@@ -30,9 +31,17 @@ buildPythonApplication (finalAttrs: {
     hash = "sha256-nQtfOKAnWKsy2DmvtRGJa4+Y9uGgX41BeHpd9m4d9YA=";
   };
 
-  # patch to set mtime=0 on setup.py
-  patches = [ ./gzip-timestamp-fix.patch ];
-  patchFlags = [ "-p0" ];
+  patches = [
+    # patch to set mtime=0 on setup.py
+    ./gzip-timestamp-fix.patch
+
+    # fixes build with setuptools 81+, while keeping it backwards compatible
+    (fetchpatch {
+      name = "arandr-0.1.11-setuptools-81.patch";
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/x11-misc/arandr/files/arandr-0.1.11-setuptools-81.patch";
+      hash = "sha256-b9U8b4rdkN5lWDVpv50szaVS0rAZVSy7q6IXNVLvq3A=";
+    })
+  ];
 
   nativeBuildInputs = [
     gobject-introspection