From 4dd10767bd2d0ca54b2b2f6784fea700dc1d56af Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sat, 29 Nov 2025 19:30:34 +0200
Subject: [PATCH 1/3] arandr: use pyproject format

---
 pkgs/by-name/ar/arandr/package.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ar/arandr/package.nix b/pkgs/by-name/ar/arandr/package.nix
index 2f10c9a42c2b..129a6b013825 100644
--- a/pkgs/by-name/ar/arandr/package.nix
+++ b/pkgs/by-name/ar/arandr/package.nix
@@ -11,12 +11,17 @@
 }:
 
 let
-  inherit (python3Packages) buildPythonApplication docutils pygobject3;
+  inherit (python3Packages)
+    buildPythonApplication
+    setuptools
+    docutils
+    pygobject3
+    ;
 in
 buildPythonApplication rec {
   pname = "arandr";
   version = "0.1.11";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitLab {
     owner = "arandr";
@@ -35,13 +40,15 @@ buildPythonApplication rec {
   ];
 
   buildInputs = [
-    docutils
     gsettings-desktop-schemas
     gtk3
+    xrandr
   ];
 
-  propagatedBuildInputs = [
-    xrandr
+  build-system = [ setuptools ];
+
+  dependencies = [
+    docutils
     pygobject3
   ];
 

From 35b537a74fd67c4f3f889bc1d15d74d655de30bf Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sat, 29 Nov 2025 19:33:34 +0200
Subject: [PATCH 2/3] arandr: don't double-wrap executables

---
 pkgs/by-name/ar/arandr/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/ar/arandr/package.nix b/pkgs/by-name/ar/arandr/package.nix
index 129a6b013825..be87a929b0af 100644
--- a/pkgs/by-name/ar/arandr/package.nix
+++ b/pkgs/by-name/ar/arandr/package.nix
@@ -59,6 +59,12 @@ buildPythonApplication rec {
   # no tests
   doCheck = false;
 
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
   passthru.updateScript = nix-update-script {
     extraArgs = [
       "--version-regex=(\\d.*)"

From 4f5fe642fa587599c088d41115e73f9923468703 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sat, 29 Nov 2025 19:39:27 +0200
Subject: [PATCH 3/3] arandr: the license is GPL-3.0-or-later

https://gitlab.com/arandr/arandr/-/blob/0.1.11/README#L135
---
 pkgs/by-name/ar/arandr/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ar/arandr/package.nix b/pkgs/by-name/ar/arandr/package.nix
index be87a929b0af..e1384ce83682 100644
--- a/pkgs/by-name/ar/arandr/package.nix
+++ b/pkgs/by-name/ar/arandr/package.nix
@@ -75,7 +75,7 @@ buildPythonApplication rec {
     changelog = "https://gitlab.com/arandr/arandr/-/blob/${src.tag}/ChangeLog";
     description = "Simple visual front end for XRandR";
     homepage = "https://christian.amsuess.com/tools/arandr/";
-    license = lib.licenses.gpl3;
+    license = lib.licenses.gpl3Plus;
     mainProgram = "arandr";
     maintainers = with lib.maintainers; [
       gepbird