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.
This commit is contained in:
committed by
Jonathan Ringer
parent
200bb8c977
commit
9bb3fccb5b
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig
|
||||
{ stdenv, fetchurl, pkg-config
|
||||
, dbus, dbus-glib, gtk3, gobject-introspection
|
||||
, gtk-doc, docbook_xml_dtd_45, docbook_xsl
|
||||
, libxslt, libxml2 }:
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0f70lkw66v9cj72q0iw1s2546r6bwwcd8idcm3621fg2fgh2rw58";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ dbus dbus-glib gtk3 gobject-introspection gtk-doc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, glib, gtk2, dbus-glib }:
|
||||
{ stdenv, fetchurl, pkg-config, glib, gtk2, dbus-glib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libunique";
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
./1.1.6-include-terminator.patch
|
||||
] ++ [ ./gcc7-bug.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ glib gtk2 dbus-glib ];
|
||||
|
||||
# Don't make deprecated usages hard errors
|
||||
|
||||
Reference in New Issue
Block a user