Merge pull request #184590 from NickCao/dbus-python

pkgs/applications/networking/instant-messengers/matrix-commander/default.nix

@@ -36,11 +36,6 @@ buildPythonApplication rec {
       -e '/asyncio/d' \
       -e '/datetime/d' \
       setup.cfg requirements.txt
-
-    # Dependencies not correctly detected
-    sed -i \
-      -e '/dbus-python/d' \
-      setup.cfg requirements.txt
   '';
 
   propagatedBuildInputs = [

pkgs/applications/terminal-emulators/terminator/default.nix

@@ -50,9 +50,6 @@ python3.pkgs.buildPythonApplication rec {
 
   postPatch = ''
     patchShebangs tests po
-    # dbus-python is correctly passed in propagatedBuildInputs, but for some reason setup.py complains.
-    # The wrapped terminator has the correct path added, so ignore this.
-    substituteInPlace setup.py --replace "'dbus-python'," ""
   '';
 
   doCheck = false;

pkgs/development/python-modules/dbus/default.nix

@@ -35,6 +35,10 @@ buildPythonPackage rec {
   doCheck = isPy3k;
   checkInputs = [ dbus.out pygobject3 ];
 
+  postInstall = ''
+    cp -r dbus_python.egg-info $out/${python.sitePackages}/
+  '';
+
   meta = with lib; {
     description = "Python DBus bindings";
     license = licenses.mit;

pkgs/development/python-modules/python-dbusmock/default.nix

@@ -21,11 +21,6 @@ buildPythonPackage rec {
     sha256 = "sha256-gsGg9zHVyDTCVZmFUI8qqXDt0ui+o3hPwjRlsYUmShg=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace '"dbus-python"' ""
-  '';
-
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
   nativeBuildInputs = [

pkgs/development/python-modules/swspotify/default.nix

@@ -35,12 +35,6 @@ buildPythonPackage rec {
     requests
   ];
 
-  postPatch = ''
-    # Detection of the  platform doesn't always works with 1.2.3
-    substituteInPlace pyproject.toml \
-      --replace 'dbus-python = {version = "^1.2.16", platform = "linux"}' ""
-  '';
-
   # Tests want to use Dbus
   doCheck = false;