From b666273ecfbab81201f852eda36f65c3bb92afc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 20 Oct 2023 09:20:57 +0200 Subject: [PATCH] python3Packages.plyer: fixup build after update in cad3bc29 Both patches were included in 2.1.0, and the substitution now needed tweaking to avoid causing a syntax error. It builds now, but it's not like I've tried to verify/understand anything. --- pkgs/development/python-modules/plyer/default.nix | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/plyer/default.nix b/pkgs/development/python-modules/plyer/default.nix index 37eeef3ccba5..5b8bc870b838 100644 --- a/pkgs/development/python-modules/plyer/default.nix +++ b/pkgs/development/python-modules/plyer/default.nix @@ -11,26 +11,13 @@ buildPythonPackage rec { sha256 = "sha256-7Icb2MVj5Uit86lRHxal6b7y9gIJ3UT2HNqpA9DYWVE="; }; - patches = [ - # fix naming of the DOCUMENTS dir - (fetchpatch { - url = "https://github.com/rski/plyer/commit/99dabb2d62248fc3ea5705c2720abf71c9fc378b.patch"; - hash = "sha256-bbnw0TxH4FGTso5dopzquDCjrjZAy+6CJauqi/nfstA="; - }) - # fix handling of the ~/.config/user-dirs.dir file - (fetchpatch { - url = "https://github.com/rski/plyer/commit/f803697a1fe4fb5e9c729ee6ef1997b8d64f3ccd.patch"; - hash = "sha256-akuh//P5puz2PwcBRXZQ4KoGk+fxi4jn2H3pTIT5M78="; - }) - ]; - postPatch = '' rm -r examples # remove all the wifi stuff. Depends on a python wifi module that has not been updated since 2016 find -iname "wifi*" -exec rm {} \; substituteInPlace plyer/__init__.py \ --replace "wifi = Proxy('wifi', facades.Wifi)" "" \ - --replace "'wifi'" "" + --replace "'wifi', " "" substituteInPlace plyer/facades/__init__.py \ --replace "from plyer.facades.wifi import Wifi" "" '';