diff --git a/modules/xborders/setup.py b/modules/xborders/setup.py deleted file mode 100644 index a002625..0000000 --- a/modules/xborders/setup.py +++ /dev/null @@ -1,12 +0,0 @@ -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 9436697..e1997a9 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 = "e74ae532b9555c59d195537934fa355b3fea73c5"; - hash = "sha256-UKsseNkXest6npPqJKvKL0iBWeK+S7zynrDlyXIOmF4="; + rev = "8a031736c9e89a031428f33adcd42da7512d558e"; + sha256 = "sha256-y+Cip5fcDqnJr0aI3jqJMTt6iCV0faunM+Gk6HFZ5iA="; }; buildInputs = [ @@ -28,14 +28,20 @@ with pkgs; callPackage python3Packages.buildPythonPackage rec { pygobject3 ]; - postPatch = let - setup = pkgs.substituteAll { - src = ./setup.py; - desc = meta.description; # "description" is reserved - inherit pname version; - }; - in '' - ln -s ${setup} setup.py + 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 ''; meta = with lib; {