public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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:
Jonathan Ringer
2021-01-19 01:16:25 -08:00
committed by Jonathan Ringer
parent 200bb8c977
commit 9bb3fccb5b
1653 changed files with 3872 additions and 3872 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/glib/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ config, stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3
{ config, stdenv, fetchurl, gettext, meson, ninja, pkg-config, perl, python3
, libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45
# use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib)
, util-linuxMinimal ? null
@@ -29,7 +29,7 @@ assert stdenv.isLinux -> util-linuxMinimal != null;
* Support org.freedesktop.Application, including D-Bus activation from desktop files
*/
let
# Some packages don't get "Cflags" from pkgconfig correctly
# Some packages don't get "Cflags" from pkg-config correctly
# and then fail to build when directly including like <glib/...>.
# This is intended to be run in postInstall of any package
# which has $out/include/ containing just some disjunct directories.
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
]);
nativeBuildInputs = [
meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45
meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45
];
propagatedBuildInputs = [ zlib libffi gettext libiconv ];