xborders: update

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',
+    ],
+)

modules/xborders/xborders.nix

@@ -7,8 +7,8 @@ with pkgs; callPackage python3Packages.buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "deter0";
     repo = "xborder";
-    rev = "8a031736c9e89a031428f33adcd42da7512d558e";
+    rev = "e74ae532b9555c59d195537934fa355b3fea73c5";
-    sha256 = "sha256-y+Cip5fcDqnJr0aI3jqJMTt6iCV0faunM+Gk6HFZ5iA=";
+    hash = "sha256-UKsseNkXest6npPqJKvKL0iBWeK+S7zynrDlyXIOmF4=";
   };
 
   buildInputs = [
@@ -28,20 +28,14 @@ with pkgs; callPackage python3Packages.buildPythonPackage rec {
     pygobject3
   ];
 
-  preBuild = ''
+  postPatch = let
-    cat >setup.py <<'EOF'
+    setup = pkgs.substituteAll {
-    from setuptools import setup
+      src = ./setup.py;
-    setup(
+      desc = meta.description; # "description" is reserved 
-      name='${pname}',
+      inherit pname version;
-      version='${version}',
+    };
-      author='deter0',
+  in ''
-      description='${meta.description}',
+    ln -s ${setup} setup.py
-      install_requires=['pycairo', 'requests', 'PyGObject'],
-      scripts=[
-        'xborders',
-      ],
-    )
-    EOF
   '';
 
   meta = with lib; {