about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobert Schütz <robert.schuetz@stud.uni-heidelberg.de>2019-02-02 15:22:52 +0100
committerRobert Schütz <robert.schuetz@stud.uni-heidelberg.de>2019-02-02 15:43:44 +0100
commiteb3f0aef438e55058f21747fe95e947977ad4734 (patch)
treea1a239fe9eae2158b424a2bf0f05d68fd4bbcb9c
parent3d979f432cef1836386ecf0cf466da06d01f422f (diff)
downloadnixlib-eb3f0aef438e55058f21747fe95e947977ad4734.tar
nixlib-eb3f0aef438e55058f21747fe95e947977ad4734.tar.gz
nixlib-eb3f0aef438e55058f21747fe95e947977ad4734.tar.bz2
nixlib-eb3f0aef438e55058f21747fe95e947977ad4734.tar.lz
nixlib-eb3f0aef438e55058f21747fe95e947977ad4734.tar.xz
nixlib-eb3f0aef438e55058f21747fe95e947977ad4734.tar.zst
nixlib-eb3f0aef438e55058f21747fe95e947977ad4734.zip
pythonPackages: use pkgs.pkgconfig where needed
Since 05232abbbc6574b31a714bc34d9639676b83c1a8, pythonPackages.pkgconfig
does no longer propagate pkgs.pkgconfig.
-rw-r--r--pkgs/top-level/python-packages.nix25
1 files changed, 18 insertions, 7 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 59de07a991ee..a51017161277 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -623,7 +623,9 @@ in {
     libglade = null;
   };
 
-  pygtksourceview = callPackage ../development/python-modules/pygtksourceview { };
+  pygtksourceview = callPackage ../development/python-modules/pygtksourceview {
+    inherit (pkgs) pkgconfig;
+  };
 
   pyGtkGlade = self.pygtk.override {
     libglade = pkgs.gnome2.libglade;
@@ -987,7 +989,9 @@ in {
 
   autopep8 = callPackage ../development/python-modules/autopep8 { };
 
-  av = callPackage ../development/python-modules/av { };
+  av = callPackage ../development/python-modules/av {
+    inherit (pkgs) pkgconfig;
+  };
 
   avro = callPackage ../development/python-modules/avro {};
 
@@ -1185,7 +1189,9 @@ in {
 
   blaze = callPackage ../development/python-modules/blaze { };
 
-  html5-parser = callPackage ../development/python-modules/html5-parser {};
+  html5-parser = callPackage ../development/python-modules/html5-parser {
+    inherit (pkgs) pkgconfig;
+  };
 
   httpserver = callPackage ../development/python-modules/httpserver {};
 
@@ -1934,7 +1940,7 @@ in {
   latexcodec = callPackage ../development/python-modules/latexcodec {};
 
   libsexy = callPackage ../development/python-modules/libsexy {
-    libsexy = pkgs.libsexy;
+    inherit (pkgs) libsexy pkgconfig;
   };
 
   libsoundtouch = callPackage ../development/python-modules/libsoundtouch { };
@@ -3682,7 +3688,9 @@ in {
 
   pyshp = callPackage ../development/python-modules/pyshp { };
 
-  pysmbc = callPackage ../development/python-modules/pysmbc { };
+  pysmbc = callPackage ../development/python-modules/pysmbc {
+    inherit (pkgs) pkgconfig;
+  };
 
   pyspread = callPackage ../development/python-modules/pyspread { };
 
@@ -3837,6 +3845,7 @@ in {
   pythonnet = callPackage ../development/python-modules/pythonnet {
     # `mono >= 4.6` required to prevent crashes encountered with earlier versions.
     mono = pkgs.mono4;
+    inherit (pkgs) pkgconfig;
   };
 
   pytz = callPackage ../development/python-modules/pytz { };
@@ -4695,7 +4704,7 @@ in {
   Logbook = callPackage ../development/python-modules/Logbook { };
 
   libversion = callPackage ../development/python-modules/libversion {
-    inherit (pkgs) libversion;
+    inherit (pkgs) libversion pkgconfig;
   };
 
   libvirt = callPackage ../development/python-modules/libvirt {
@@ -4718,7 +4727,9 @@ in {
 
   power = callPackage ../development/python-modules/power { };
 
-  pythonefl = callPackage ../development/python-modules/python-efl { };
+  pythonefl = callPackage ../development/python-modules/python-efl {
+    inherit (pkgs) pkgconfig;
+  };
 
   tlsh = callPackage ../development/python-modules/tlsh { };