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:
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
File diff suppressed because it is too large Load Diff
@@ -292,7 +292,7 @@ foreach my $pkg (sort (keys %pkgURLs)) {
my @arguments = @buildInputs;
push @arguments, @nativeBuildInputs;
unshift @arguments, "stdenv", "pkgconfig", "fetchurl";
unshift @arguments, "stdenv", "pkg-config", "fetchurl";
my $argumentsStr = join ", ", @arguments;
my $extraAttrsStr = "";
@@ -309,7 +309,7 @@ foreach my $pkg (sort (keys %pkgURLs)) {
sha256 = "$pkgHashes{$pkg}";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig $nativeBuildInputsStr];
nativeBuildInputs = [ pkg-config $nativeBuildInputsStr];
buildInputs = [ $buildInputsStr];$extraAttrsStr
meta.platforms = lib.platforms.unix;
}) {};
+4 -4
View File
@@ -4,7 +4,7 @@
freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge,
libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm,
mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook,
mcpp, epoxy, openssl, pkgconfig, llvm_6, libxslt,
mcpp, epoxy, openssl, pkg-config, llvm_6, libxslt,
ApplicationServices, Carbon, Cocoa, Xplugin
}:
@@ -467,7 +467,7 @@ self: super:
configureFlags = [ "--with-xkb-rules-symlink=xorg" ];
# 1: compatibility for X11/xkb location
# 2: I think pkgconfig/ is supposed to be in /lib/
# 2: I think pkg-config/ is supposed to be in /lib/
postInstall = ''
ln -s share "$out/etc"
mkdir -p "$out/lib" && ln -s ../share/pkgconfig "$out/lib/"
@@ -589,7 +589,7 @@ self: super:
url = "mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2";
sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ xorgproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
meta.platforms = lib.platforms.unix;
} else if (abiCompat == "1.18") then {
@@ -599,7 +599,7 @@ self: super:
url = "mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2";
sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ xorgproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
postPatch = lib.optionalString stdenv.isLinux "sed '1i#include <malloc.h>' -i include/os.h";
meta.platforms = lib.platforms.unix;
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, m4, libxcb, xcbutil, libX11 }:
{ lib, stdenv, fetchurl, pkg-config, m4, libxcb, xcbutil, libX11 }:
stdenv.mkDerivation rec {
version = "1.3";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "118cj1ybw86pgw0l5whn9vbg5n5b0ijcpx295mwahzi004vz671h";
};
nativeBuildInputs = [ pkgconfig m4 ];
nativeBuildInputs = [ pkg-config m4 ];
doCheck = true;
buildInputs = [ libxcb xcbutil ];
checkInputs = [ libX11 ];