treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix

continuation of #109595 pkgconfig was aliased in 2018, however, it remained in all-packages.nix due to its wide usage. This cleans up the remaining references to pkgs.pkgsconfig and moves the entry to aliases.nix. python3Packages.pkgconfig remained unchanged because it's the canonical name of the upstream package on pypi.
2026-07-20 23:51:03 +00:00 · 2021-01-18 22:50:56 -08:00
parent 200bb8c977
commit 9bb3fccb5b
1653 changed files with 3872 additions and 3872 deletions
--- a/pkgs/development/python-modules/av/default.nix
+++ b/pkgs/development/python-modules/av/default.nix
@@ -4,7 +4,7 @@
 , isPy27
 , numpy
 , ffmpeg
-, pkgconfig
+, pkg-config
 }:

 buildPythonPackage rec {
@@ -19,7 +19,7 @@ buildPythonPackage rec {

  checkInputs = [ numpy ];

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ ffmpeg ];

  # Tests require downloading files from internet
--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/pkgs/development/python-modules/dbus/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, isPyPy
+{ lib, fetchPypi, buildPythonPackage, python, pkg-config, dbus, dbus-glib, isPyPy
 , ncurses, pygobject3, isPy3k }:

 buildPythonPackage rec {
@@ -19,7 +19,7 @@ buildPythonPackage rec {

  disabled = isPyPy;

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ dbus dbus-glib ]
    # My guess why it's sometimes trying to -lncurses.
    # It seems not to retain the dependency anyway.
--- a/pkgs/development/python-modules/fuse-python/default.nix
+++ b/pkgs/development/python-modules/fuse-python/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pkgconfig, fuse }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, fuse }:

 buildPythonPackage rec {
  pname = "fuse-python";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
  };

  buildInputs = [ fuse ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];

  # no tests in the Pypi archive
  doCheck = false;
--- a/pkgs/development/python-modules/goocalendar/default.nix
+++ b/pkgs/development/python-modules/goocalendar/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv
 , fetchPypi
 , buildPythonPackage
-, pkgconfig
+, pkg-config
 , gtk3
 , gobject-introspection
 , pygtk
@@ -24,7 +24,7 @@ buildPythonPackage rec {
  };

  nativeBuildInputs = [
-    pkgconfig
+    pkg-config
    gobject-introspection
  ];

--- a/pkgs/development/python-modules/gphoto2/default.nix
+++ b/pkgs/development/python-modules/gphoto2/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchPypi, buildPythonPackage
-, pkgconfig
+, pkg-config
 , libgphoto2 }:

 buildPythonPackage rec {
@@ -11,7 +11,7 @@ buildPythonPackage rec {
    sha256 = "48b4c4ab70826d3ddaaf7440564d513c02d78680fa690994b0640d383ffb8a7d";
  };

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ libgphoto2 ];

--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -3,7 +3,7 @@
 , meson
 , ninja
 , stdenv
-, pkgconfig
+, pkg-config
 , python3
 , pygobject3
 , gobject-introspection
@@ -30,7 +30,7 @@ buildPythonPackage rec {
  nativeBuildInputs = [
    meson
    ninja
-    pkgconfig
+    pkg-config
    python3
    gobject-introspection
    gst-plugins-base
--- a/pkgs/development/python-modules/html5-parser/default.nix
+++ b/pkgs/development/python-modules/html5-parser/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pkgs, pkgconfig, chardet, lxml }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pkgs, pkg-config, chardet, lxml }:

 buildPythonPackage rec {
  pname = "html5-parser";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
    sha256 = "25fe8f6848cbc15187f6748c0695df32bcf1b37df6420b6a01b4ebe1ec1ed48f";
  };

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  propagatedBuildInputs = [ chardet lxml pkgs.libxml2 ];

  doCheck = false; # No such file or directory: 'run_tests.py'
--- a/pkgs/development/python-modules/imread/default.nix
+++ b/pkgs/development/python-modules/imread/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , nose
-, pkgconfig
+, pkg-config
 , libjpeg
 , libpng
 , libtiff
@@ -21,7 +21,7 @@ buildPythonPackage rec {
  };


-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ nose libjpeg libpng libtiff libwebp ];
  propagatedBuildInputs = [ numpy ];

--- a/pkgs/development/python-modules/libasyncns/default.nix
+++ b/pkgs/development/python-modules/libasyncns/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, buildPythonPackage, fetchurl
-, libasyncns, pkgconfig }:
+, libasyncns, pkg-config }:

 buildPythonPackage rec {
  pname = "libasyncns-python";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
  patches = [ ./libasyncns-fix-res-consts.patch ];

  buildInputs = [ libasyncns ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  doCheck = false; # requires network access

  meta = with lib; {
--- a/pkgs/development/python-modules/libversion/default.nix
+++ b/pkgs/development/python-modules/libversion/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchPypi, pkgconfig, libversion, pythonOlder }:
+{ lib, stdenv, buildPythonPackage, fetchPypi, pkg-config, libversion, pythonOlder }:

 buildPythonPackage rec {
  pname = "libversion";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
    sha256 = "1h8x9hglrqi03f461lhw3wwz23zs84dgw7hx4laxcmyrgvyzvcq1";
  };

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ libversion ];

  disabled = pythonOlder "3.6";
--- a/pkgs/development/python-modules/libvirt/5.9.0.nix
+++ b/pkgs/development/python-modules/libvirt/5.9.0.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchgit, pkgconfig, lxml, libvirt, nose }:
+{ lib, stdenv, buildPythonPackage, fetchgit, pkg-config, lxml, libvirt, nose }:

 buildPythonPackage rec {
  pname = "libvirt";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
    sha256 = "0qvr0s7yasswy1s5cvkm91iifk33pb8s7nbb38zznc46706b358r";
  };

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ libvirt lxml ];

  checkInputs = [ nose ];
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitLab, pkgconfig, lxml, libvirt, nose }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitLab, pkg-config, lxml, libvirt, nose }:

 buildPythonPackage rec {
  pname = "libvirt";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
    sha256 = "sha256-A3eRfzQAfubyPefDlq5bAiFJ/G90D2JKdJO2Em0wE00=";
  };

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ libvirt lxml ];

  checkInputs = [ nose ];
--- a/pkgs/development/python-modules/llfuse/default.nix
+++ b/pkgs/development/python-modules/llfuse/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkgconfig, pytest, fuse, attr, which
+{ lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkg-config, pytest, fuse, attr, which
 , contextlib2, osxfuse
 }:

@@ -23,7 +23,7 @@ buildPythonPackage rec {
    })
  ];

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs =
    optionals stdenv.isLinux [ fuse ]
    ++ optionals stdenv.isDarwin [ osxfuse ];
--- a/pkgs/development/python-modules/matplotlib/2.nix
+++ b/pkgs/development/python-modules/matplotlib/2.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchPypi, python, buildPythonPackage, pycairo, backports_functools_lru_cache
 , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
-, freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32
+, freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32
 , fetchpatch
 , enableGhostscript ? false, ghostscript ? null, gtk3
 , enableGtk3 ? false, cairo
@@ -39,7 +39,7 @@ buildPythonPackage rec {

  XDG_RUNTIME_DIR = "/tmp";

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ which sphinx ]
    ++ stdenv.lib.optional enableGhostscript ghostscript
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchPypi, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache
 , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
-, freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection
+, freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection
 , certifi, pillow
 , enableGhostscript ? true, ghostscript ? null, gtk3
 , enableGtk3 ? false, cairo
@@ -32,7 +32,7 @@ buildPythonPackage rec {

  XDG_RUNTIME_DIR = "/tmp";

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ which sphinx ]
    ++ stdenv.lib.optional enableGhostscript ghostscript
--- a/pkgs/development/python-modules/poppler-qt5/default.nix
+++ b/pkgs/development/python-modules/poppler-qt5/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, lib, stdenv, sip, qtbase, pyqt5, poppler, pkgconfig, fetchpatch
+{ buildPythonPackage, fetchPypi, lib, stdenv, sip, qtbase, pyqt5, poppler, pkg-config, fetchpatch
 , substituteAll
 }:

@@ -28,7 +28,7 @@ buildPythonPackage rec {
  ];

  buildInputs = [ qtbase.dev poppler ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  propagatedBuildInputs = [ sip pyqt5.dev ];

  # no tests, just bindings for `poppler_qt5`
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/pkgs/development/python-modules/pyarrow/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }:
+{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools_scm, six }:

 let
  _arrow-cpp = arrow-cpp.override { python3 = python; };
@@ -12,7 +12,7 @@ buildPythonPackage rec {

  sourceRoot = "apache-arrow-${version}/python";

-  nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ];
+  nativeBuildInputs = [ cmake cython pkg-config setuptools_scm ];
  propagatedBuildInputs = [ numpy six ];
  checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ];

--- a/pkgs/development/python-modules/pyatspi/default.nix
+++ b/pkgs/development/python-modules/pyatspi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }:
+{ lib, stdenv, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }:

 buildPythonPackage rec {
  pname = "pyatspi";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
    sha256 = "/4CTEv0ML2HhkcGBoaY4owtXm5G2gs+1oFU1pVJltD0=";
  };

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];

  buildInputs = [
    at-spi2-core
--- a/pkgs/development/python-modules/pycangjie/default.nix
+++ b/pkgs/development/python-modules/pycangjie/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, bash, autoconf, automake, libtool, pkgconfig, libcangjie
+{ lib, stdenv, fetchurl, bash, autoconf, automake, libtool, pkg-config, libcangjie
 , sqlite, buildPythonPackage, cython
 }:

@@ -14,7 +14,7 @@ in buildPythonPackage {
    sha256 = "12yi09nyffmn4va7lzk4irw349qzlbxgsnb89dh15cnw0xmrin05";
  };

-  nativeBuildInputs = [ pkgconfig libtool autoconf automake cython ];
+  nativeBuildInputs = [ pkg-config libtool autoconf automake cython ];
  buildInputs = [ libcangjie sqlite ];

  preConfigure = ''
--- a/pkgs/development/python-modules/pygobject/3.36.nix
+++ b/pkgs/development/python-modules/pygobject/3.36.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobject-introspection,
+{ lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection,
 pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }:

 buildPythonPackage rec {
@@ -18,7 +18,7 @@ buildPythonPackage rec {
    "-Dpython=python${if isPy3k then "3" else "2" }"
  ];

-  nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection ];
+  nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ];
  buildInputs = [ glib gobject-introspection ]
                 ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ];
  propagatedBuildInputs = [ pycairo cairo ];
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, buildPythonPackage, pkgconfig, glib, gobject-introspection,
+{ lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection,
 pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }:

 buildPythonPackage rec {
@@ -16,7 +16,7 @@ buildPythonPackage rec {

  outputs = [ "out" "dev" ];

-  nativeBuildInputs = [ pkgconfig meson ninja gobject-introspection ];
+  nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ];
  buildInputs = [ glib gobject-introspection ]
                 ++ stdenv.lib.optionals stdenv.isDarwin [ which ncurses ];
  propagatedBuildInputs = [ pycairo cairo ];
--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/pkgs/development/python-modules/pygobject/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, buildPythonPackage, pkgconfig, glib, isPy3k, pythonAtLeast }:
+{ stdenv, fetchurl, python, buildPythonPackage, pkg-config, glib, isPy3k, pythonAtLeast }:

 buildPythonPackage rec {
  pname = "pygobject";
@@ -19,7 +19,7 @@ buildPythonPackage rec {

  configureFlags = [ "--disable-introspection" ];

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ glib ];

  # in a "normal" setup, pygobject and pygtk are installed into the
--- a/pkgs/development/python-modules/pygraphviz/default.nix
+++ b/pkgs/development/python-modules/pygraphviz/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, buildPythonPackage, isPy3k, fetchPypi, substituteAll, graphviz
-, pkgconfig, doctest-ignore-unicode, mock, nose }:
+, pkg-config, doctest-ignore-unicode, mock, nose }:

 buildPythonPackage rec {
  pname = "pygraphviz";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
    extension = "zip";
  };

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ graphviz ];
  checkInputs = [ doctest-ignore-unicode mock nose ];

--- a/pkgs/development/python-modules/pygtk/default.nix
+++ b/pkgs/development/python-modules/pygtk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, fetchpatch, python, pkgconfig, gtk2, pygobject2, pycairo, pango
+{ lib, stdenv, fetchurl, fetchpatch, python, pkg-config, gtk2, pygobject2, pycairo, pango
 , buildPythonPackage, libglade ? null, isPy3k }:

 buildPythonPackage rec {
@@ -24,7 +24,7 @@ buildPythonPackage rec {
    })
  ];

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [
    pango
  ] ++ stdenv.lib.optional (libglade != null) libglade;
--- a/pkgs/development/python-modules/pygtksourceview/default.nix
+++ b/pkgs/development/python-modules/pygtksourceview/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, python, buildPythonPackage, pkgconfig, pygobject2, glib, pygtk, gnome2 }:
+{ lib, fetchurl, python, buildPythonPackage, pkg-config, pygobject2, glib, pygtk, gnome2 }:

 buildPythonPackage rec {
  pname = "pygtksourceview";
@@ -12,7 +12,7 @@ buildPythonPackage rec {

  patches = [ ./codegendir.patch ];

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ python pygobject2 glib pygtk gnome2.gtksourceview ];

  meta = {
--- a/pkgs/development/python-modules/pyqt/4.x.nix
+++ b/pkgs/development/python-modules/pyqt/4.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip, qt4, pkgconfig, lndir, dbus, makeWrapper }:
+{ stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip, qt4, pkg-config, lndir, dbus, makeWrapper }:

 buildPythonPackage rec {
  pname = "PyQt-x11-gpl";
@@ -42,7 +42,7 @@ buildPythonPackage rec {
    "--verbose"
  ];

-  nativeBuildInputs = [ pkgconfig lndir makeWrapper qt4 ];
+  nativeBuildInputs = [ pkg-config lndir makeWrapper qt4 ];
  buildInputs = [ qt4 dbus ];

  propagatedBuildInputs = [ sip ];
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -1,4 +1,4 @@
-{ lib, pythonPackages, pkgconfig
+{ lib, pythonPackages, pkg-config
 , dbus
 , qmake, lndir
 , qtbase
@@ -41,7 +41,7 @@ in buildPythonPackage rec {
  outputs = [ "out" "dev" ];

  nativeBuildInputs = [
-    pkgconfig
+    pkg-config
    qmake
    lndir
    sip
--- a/pkgs/development/python-modules/pyqtwebengine/default.nix
+++ b/pkgs/development/python-modules/pyqtwebengine/default.nix
@@ -1,4 +1,4 @@
-{ lib, pythonPackages, pkgconfig
+{ lib, pythonPackages, pkg-config
 , qmake, qtbase, qtsvg, qtwebengine
 , wrapQtAppsHook
 }:
@@ -27,7 +27,7 @@ in buildPythonPackage rec {
  outputs = [ "out" "dev" ];

  nativeBuildInputs = [
-    pkgconfig
+    pkg-config
    qmake
    sip
    qtbase
--- a/pkgs/development/python-modules/pysmbc/default.nix
+++ b/pkgs/development/python-modules/pysmbc/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, buildPythonPackage, fetchPypi
-, samba, pkgconfig
+, samba, pkg-config
 , setuptools }:

 buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
    sha256 = "14b75f358ical7zzqh3g1qkh2dxwxn2gz7sah5f5svndqkd3z8jy";
  };

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ setuptools samba ];

  meta = with lib; {
--- a/pkgs/development/python-modules/python-efl/default.nix
+++ b/pkgs/development/python-modules/python-efl/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv
 , fetchurl
 , buildPythonPackage
-, pkgconfig
+, pkg-config
 , python
 , dbus-python
 , enlightenment
@@ -18,7 +18,7 @@ buildPythonPackage rec {
    sha256 = "0bk161xwlz4dlv56r68xwkm8snzfifaxd1j7w2wcyyk4fgvnvq4r";
  };

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ enlightenment.efl ];

--- a/pkgs/development/python-modules/python-igraph/default.nix
+++ b/pkgs/development/python-modules/python-igraph/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage, fetchPypi, lib, isPy3k
-, pkgconfig, igraph
+, pkg-config, igraph
 , texttable }:

 buildPythonPackage rec {
@@ -7,7 +7,7 @@ buildPythonPackage rec {
  version = "0.8.3";
  disabled = !isPy3k; # fails to build

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ igraph ];
  propagatedBuildInputs = [ texttable ];

--- a/pkgs/development/python-modules/python_openzwave/default.nix
+++ b/pkgs/development/python-modules/python_openzwave/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, buildPythonPackage, fetchPypi, isPy3k
-, pkgconfig
+, pkg-config
 , systemd, libyaml, openzwave, cython, pyserial
 , six, pydispatcher, urwid }:

@@ -15,7 +15,7 @@ buildPythonPackage rec {
    extension = "zip";
  };

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ systemd libyaml openzwave cython ];
  propagatedBuildInputs = [ six urwid pydispatcher pyserial ];

--- a/pkgs/development/python-modules/pythonnet/default.nix
+++ b/pkgs/development/python-modules/pythonnet/default.nix
@@ -6,7 +6,7 @@
 , pytest
 , pycparser
 , psutil
-, pkgconfig
+, pkg-config
 , dotnetbuildhelpers
 , clang
 , glib
@@ -53,7 +53,7 @@ buildPythonPackage rec {
    pytest
    pycparser

-    pkgconfig
+    pkg-config
    dotnetbuildhelpers
    clang

--- a/pkgs/development/python-modules/roboschool/default.nix
+++ b/pkgs/development/python-modules/roboschool/default.nix
@@ -9,7 +9,7 @@
 , assimp
 , gym
 , bullet-roboschool
-, pkgconfig
+, pkg-config
 , which
 }:

@@ -32,7 +32,7 @@ buildPythonPackage rec {
  ];

  nativeBuildInputs = [
-    pkgconfig
+    pkg-config
    qtbase # needs the `moc` tool
    which
  ];
--- a/pkgs/development/python-modules/secp256k1/default.nix
+++ b/pkgs/development/python-modules/secp256k1/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, pkgconfig
+, pkg-config
 , pytest
 , pytestrunner
 , cffi
@@ -17,7 +17,7 @@ buildPythonPackage rec {
    sha256 = "a3b43e02d321c09eafa769a6fc2c156f555cab3a7db62175ef2fd21e16cdf20c";
  };

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  checkInputs = [ pytest pytestrunner ];
  propagatedBuildInputs = [ cffi secp256k1 ];

--- a/pkgs/development/python-modules/sentencepiece/default.nix
+++ b/pkgs/development/python-modules/sentencepiece/default.nix
@@ -1,14 +1,14 @@
 { buildPythonPackage
 , stdenv
 , sentencepiece
-, pkgconfig
+, pkg-config
 }:

 buildPythonPackage rec {
  pname = "sentencepiece";
  inherit (sentencepiece) version src;

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ sentencepiece.dev ];

  sourceRoot = "source/python";
--- a/pkgs/development/python-modules/sipsimple/default.nix
+++ b/pkgs/development/python-modules/sipsimple/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
    export LD=$CC
  '';

-  nativeBuildInputs = [ pkgs.pkgconfig ];
+  nativeBuildInputs = [ pkgs.pkg-config ];
  buildInputs = with pkgs; [ alsaLib ffmpeg_3 libv4l sqlite libvpx ];
  propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ];

--- a/pkgs/development/python-modules/systemd/default.nix
+++ b/pkgs/development/python-modules/systemd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkgconfig }:
+{ lib, stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkg-config }:

 buildPythonPackage rec {
  pname = "systemd";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
  };

  buildInputs = [ systemd ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];

  doCheck = false;

--- a/pkgs/development/python-modules/virtkey/default.nix
+++ b/pkgs/development/python-modules/virtkey/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchurl, pkgconfig, gtk2, libX11, libXtst, libXi, libxkbfile, xorgproto }:
+{ lib, buildPythonPackage, fetchurl, pkg-config, gtk2, libX11, libXtst, libXi, libxkbfile, xorgproto }:

 let
  majorVersion = "0.63";
@@ -12,7 +12,7 @@ in buildPythonPackage rec {
    sha256 = "0hd99hrxn6bh3rxcrdnad5cqjsphrn1s6fzx91q07d44k6cg6qcr";
  };

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ gtk2 libX11 libXtst libXi libxkbfile xorgproto ];

--- a/pkgs/development/python-modules/wxPython/3.0.nix
+++ b/pkgs/development/python-modules/wxPython/3.0.nix
@@ -6,7 +6,7 @@
 , libX11
 , wxGTK
 , wxmac
-, pkgconfig
+, pkg-config
 , buildPythonPackage
 , pyopengl
 , isPy3k
@@ -35,7 +35,7 @@ buildPythonPackage rec {

  hardeningDisable = [ "format" ];

-  nativeBuildInputs = [ pkgconfig ]
+  nativeBuildInputs = [ pkg-config ]
    ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK libX11 ])
    ++ (lib.optionals stdenv.isDarwin [ wxmac ]);

--- a/pkgs/development/python-modules/wxPython/4.0.nix
+++ b/pkgs/development/python-modules/wxPython/4.0.nix
@@ -2,7 +2,7 @@
 , stdenv
 , buildPythonPackage
 , fetchPypi
-, pkgconfig
+, pkg-config
 , which
 , cairo
 , pango
@@ -34,7 +34,7 @@ buildPythonPackage rec {

  doCheck = false;

-  nativeBuildInputs = [ pkgconfig which doxygen ]
+  nativeBuildInputs = [ pkg-config which doxygen ]
  ++ (if stdenv.isDarwin then [ wxmac ] else [ wxGTK ]);

  buildInputs = [ ncurses libintl ]
--- a/pkgs/development/python-modules/wxPython/4.1.nix
+++ b/pkgs/development/python-modules/wxPython/4.1.nix
@@ -3,7 +3,7 @@
 , fetchPypi
 , buildPythonPackage
 , which
-, pkgconfig
+, pkg-config
 , python
 , isPy27
 , pyopengl
@@ -30,7 +30,7 @@ buildPythonPackage rec {
  # https://github.com/wxWidgets/Phoenix/issues/1316
  doCheck = false;

-  nativeBuildInputs = [ which doxygen wxGTK pkgconfig ];
+  nativeBuildInputs = [ which doxygen wxGTK pkg-config ];

  buildInputs = [
    wxGTK.gtk
--- a/pkgs/development/python-modules/zstd/default.nix
+++ b/pkgs/development/python-modules/zstd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, pkgconfig, fetchPypi, buildPythonPackage
+{ lib, stdenv, pkg-config, fetchPypi, buildPythonPackage
 , buildPackages
 , zstd, pytest }:

@@ -13,10 +13,10 @@ buildPythonPackage rec {

  postPatch = ''
    substituteInPlace setup.py \
-      --replace "/usr/bin/pkg-config" "${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config"
+      --replace "/usr/bin/pkg-config" "${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config"
  '';

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ zstd ];

  setupPyBuildFlags = [