From 467792271ed6ddb7d2b771a20ec14d58e18bb525 Mon Sep 17 00:00:00 2001 From: ElnuDev Date: Tue, 21 Feb 2023 18:24:45 -0800 Subject: [PATCH] xborders: add requested changes --- modules/xborders/xborders.nix | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/modules/xborders/xborders.nix b/modules/xborders/xborders.nix index 49711c8..08adbe7 100644 --- a/modules/xborders/xborders.nix +++ b/modules/xborders/xborders.nix @@ -3,18 +3,34 @@ with pkgs; callPackage python3Packages.buildPythonPackage rec { pname = "xborders"; version = "3.4"; # in version.txt + src = fetchFromGitHub { owner = "deter0"; repo = "xborder"; rev = "d840ed649e92b7ad399cdb1a30aeca7d09f2c08f"; sha256 = "sha256-Q2WWXekUL/OOr/OBqJOZbAHaWURbP+coBVp206uPSNY="; }; - buildInputs = [ libwnck gtk3 libnotify ]; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; - propagatedBuildInputs = with python3Packages; [ pycairo requests pygobject3 ]; + + buildInputs = [ + libwnck + gtk3 + libnotify + ]; + + nativeBuildInputs = [ + wrapGAppsHook + gobject-introspection + ]; + + propagatedBuildInputs = with python3Packages; [ + pycairo + requests + pygobject3 + ]; + preBuild = '' - sed '52,58!d' ${pname} - sed -i '51 a\ return ${version}' ${pname} + sed '52,58!d' xborders + sed -i '51 a\ return ${version}' xborders cat >setup.py <<'EOF' from setuptools import setup setup( @@ -24,11 +40,12 @@ with pkgs; callPackage python3Packages.buildPythonPackage rec { description='${meta.description}', install_requires=['pycairo', 'requests', 'PyGObject'], scripts=[ - '${pname}', + 'xborders', ], ) EOF ''; + meta = with lib; { description = "Active window border replacement for window managers."; homepage = "https://github.com/deter0/xborder";