From a0f85bf7fd70a56a23fd094f89bf4971ac206a08 Mon Sep 17 00:00:00 2001
From: ElnuDev <elnu@elnu.com>
Date: Sat, 25 Feb 2023 20:42:43 -0800
Subject: [PATCH 1/2] xborders: setup.py in separate file

---
 modules/xborders/setup.py     | 12 ++++++++++++
 modules/xborders/xborders.nix | 22 ++++++++--------------
 2 files changed, 20 insertions(+), 14 deletions(-)
 create mode 100644 modules/xborders/setup.py

diff --git a/modules/xborders/setup.py b/modules/xborders/setup.py
new file mode 100644
index 0000000..a002625
--- /dev/null
+++ b/modules/xborders/setup.py
@@ -0,0 +1,12 @@
+from setuptools import setup
+
+setup(
+    name='@pname@',
+    version='@version@',
+    author='deter0',
+    description='@desc@',
+    install_requires=['pycairo', 'requests', 'PyGObject'],
+    scripts=[
+        'xborders',
+    ],
+)
diff --git a/modules/xborders/xborders.nix b/modules/xborders/xborders.nix
index e1997a9..75ee459 100644
--- a/modules/xborders/xborders.nix
+++ b/modules/xborders/xborders.nix
@@ -28,20 +28,14 @@ with pkgs; callPackage python3Packages.buildPythonPackage rec {
     pygobject3
   ];
 
-  preBuild = ''
-    cat >setup.py <<'EOF'
-    from setuptools import setup
-    setup(
-      name='${pname}',
-      version='${version}',
-      author='deter0',
-      description='${meta.description}',
-      install_requires=['pycairo', 'requests', 'PyGObject'],
-      scripts=[
-        'xborders',
-      ],
-    )
-    EOF
+  postPatch = let
+    setup = pkgs.substituteAll {
+      src = ./setup.py;
+      desc = meta.description; # "description" is reserved 
+      inherit pname version;
+    };
+  in ''
+    ln -s ${setup} setup.py
   '';
 
   meta = with lib; {

From a49d9ac0ca72bce703a860582234442369b75cb8 Mon Sep 17 00:00:00 2001
From: ElnuDev <elnu@elnu.com>
Date: Sat, 25 Feb 2023 20:51:40 -0800
Subject: [PATCH 2/2] xborders: update

---
 modules/xborders/xborders.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/xborders/xborders.nix b/modules/xborders/xborders.nix
index 75ee459..9436697 100644
--- a/modules/xborders/xborders.nix
+++ b/modules/xborders/xborders.nix
@@ -7,8 +7,8 @@ with pkgs; callPackage python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "deter0";
     repo = "xborder";
-    rev = "8a031736c9e89a031428f33adcd42da7512d558e";
-    sha256 = "sha256-y+Cip5fcDqnJr0aI3jqJMTt6iCV0faunM+Gk6HFZ5iA=";
+    rev = "e74ae532b9555c59d195537934fa355b3fea73c5";
+    hash = "sha256-UKsseNkXest6npPqJKvKL0iBWeK+S7zynrDlyXIOmF4=";
   };
 
   buildInputs = [