From 6c3c539c53d295db6a5ce6b500c944c7ea04cdc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Sun, 27 Jun 2021 11:46:09 +0200 Subject: [PATCH 1/2] python3Packages.poppler-qt5: reduce the amount of patching done to `pyproject.toml` --- pkgs/development/python-modules/poppler-qt5/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index 4a9fdfa42620..74543566dacc 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -42,11 +42,8 @@ buildPythonPackage rec { postPatch = '' cat <> pyproject.toml - sip-include-dirs = ["${pyqt5}/share/sip/PyQt5"] - [tool.sip.bindings.Poppler-Qt5] include-dirs = ["${poppler.dev}/include/poppler"] - tags = ["${sip.platform_tag}"] EOF ''; From d3f5e322612ef58b047b438f7361febcdd4d7848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Sun, 27 Jun 2021 16:37:14 +0200 Subject: [PATCH 2/2] python3Packages.poppler-qt5: remove unused arguments --- pkgs/development/python-modules/poppler-qt5/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index 74543566dacc..857f97162517 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -1,9 +1,7 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , isPy3k , fetchPypi -, pythonPackages , sip , qtbase , qmake