From 7455889641b3f20a974d2cb0467723c6a07dae0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 10 Feb 2019 11:42:28 +0100 Subject: [PATCH] python*Packages: yet another round of pkgs.pkgconfig --- pkgs/top-level/python-packages.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 817da17cc0dc..e9eaed13f791 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -578,7 +578,9 @@ in { inherit (pkgs) pkgconfig; }; - pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { }); + pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { + inherit (pkgs) pkgconfig; + }); pycrc = callPackage ../development/python-modules/pycrc { }; @@ -2070,6 +2072,7 @@ in { poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { inherit (pkgs.qt5) qtbase; inherit (pkgs.libsForQt5) poppler; + inherit (pkgs) pkgconfig; }; poyo = callPackage ../development/python-modules/poyo { }; @@ -2512,7 +2515,9 @@ in { wtforms = callPackage ../development/python-modules/wtforms { }; - graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { }; + graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { + inherit (pkgs) pkgconfig; + }; grappelli_safe = callPackage ../development/python-modules/grappelli_safe { }; @@ -2923,7 +2928,9 @@ in { python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; - python_openzwave = callPackage ../development/python-modules/python_openzwave { }; + python_openzwave = callPackage ../development/python-modules/python_openzwave { + inherit (pkgs) pkgconfig; + }; python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { }; @@ -3501,6 +3508,7 @@ in { kmsxx = (callPackage ../development/libraries/kmsxx { inherit (pkgs.kmsxx) stdenv; + inherit (pkgs) pkgconfig; }).overrideAttrs (oldAttrs: { name = "${python.libPrefix}-${pkgs.kmsxx.name}"; }); @@ -4214,7 +4222,9 @@ in { vega_datasets = callPackage ../development/python-modules/vega_datasets { }; - virtkey = callPackage ../development/python-modules/virtkey { }; + virtkey = callPackage ../development/python-modules/virtkey { + inherit (pkgs) pkgconfig; + }; virtual-display = callPackage ../development/python-modules/virtual-display { }; @@ -4844,7 +4854,9 @@ in { dot2tex = callPackage ../development/python-modules/dot2tex { }; - poezio = callPackage ../applications/networking/instant-messengers/poezio { }; + poezio = callPackage ../applications/networking/instant-messengers/poezio { + inherit (pkgs) pkgconfig; + }; potr = callPackage ../development/python-modules/potr {};