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, lib, fetchFromGitHub, cmake, pkgconfig, alsaLib, ffmpeg, glib, openssl
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, alsaLib, ffmpeg, glib, openssl
|
||||
, pcre, zlib, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama
|
||||
, libXrandr, libXrender, libXv, libXtst, libxkbcommon, libxkbfile, wayland
|
||||
, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt, cairo
|
||||
@@ -82,7 +82,7 @@ in stdenv.mkDerivation rec {
|
||||
zlib
|
||||
] ++ optional stdenv.isLinux systemd;
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, autoconf, automake, pkgconfig, libtool
|
||||
{ stdenv, lib, fetchurl, autoconf, automake, pkg-config, libtool
|
||||
, gtk2, halibut, ncurses, perl, darwin
|
||||
}:
|
||||
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
done
|
||||
'' else null;
|
||||
|
||||
nativeBuildInputs = [ autoconf automake halibut libtool perl pkgconfig ];
|
||||
nativeBuildInputs = [ autoconf automake halibut libtool perl pkg-config ];
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isUnix [
|
||||
gtk2 ncurses
|
||||
] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{lib, stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1, nettle, gnutls, pkgconfig, autoreconfHook
|
||||
{lib, stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1, nettle, gnutls, pkg-config, autoreconfHook
|
||||
, enableCredssp ? (!stdenv.isDarwin)
|
||||
} :
|
||||
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation (rec {
|
||||
sha256 = "1s6k1jwd28y38ymk3lfv76ch4arpfwrbdhpkbnwwy3fc4617gb78";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [pkgconfig autoreconfHook];
|
||||
nativeBuildInputs = [pkg-config autoreconfHook];
|
||||
buildInputs = [openssl libX11 libXcursor libtasn1 nettle gnutls]
|
||||
++ lib.optional enableCredssp krb5;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkgconfig, wrapGAppsHook
|
||||
{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook
|
||||
, glib, gtk3, gettext, libxkbfile, libX11
|
||||
, freerdp, libssh, libgcrypt, gnutls
|
||||
, pcre2, libdbusmenu-gtk3, libappindicator-gtk3
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-n3YfLKCv6CoBeUIv+1yN6RIih63PTFj5zr+dZDJwYdw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ];
|
||||
nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ];
|
||||
buildInputs = [
|
||||
gsettings-desktop-schemas
|
||||
glib gtk3 gettext libxkbfile libX11
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh
|
||||
, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }:
|
||||
, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }:
|
||||
|
||||
mkDerivation {
|
||||
pname = "x2goclient";
|
||||
@@ -12,7 +12,7 @@ mkDerivation {
|
||||
};
|
||||
|
||||
buildInputs = [ cups libssh libXpm nx-libs openldap openssh
|
||||
qtbase qtsvg qtx11extras qttools phonon pkgconfig ];
|
||||
qtbase qtsvg qtx11extras qttools phonon pkg-config ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkgconfig, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }:
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }:
|
||||
|
||||
let
|
||||
xorgxrdp = stdenv.mkDerivation rec {
|
||||
@@ -12,7 +12,7 @@ let
|
||||
sha256 = "1bhp5x47hajhinvglmc4vxxnpjvfjm6369njb3ghqfr7c5xypvzr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];
|
||||
nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ];
|
||||
|
||||
buildInputs = [ xorg.xorgserver ];
|
||||
|
||||
@@ -45,7 +45,7 @@ let
|
||||
sha256 = "0ynj6pml4f38y8571ryhifza57wfqg4frdrjcwzw3fmryiznfm1z";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoconf automake which libtool nasm ];
|
||||
nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ];
|
||||
|
||||
buildInputs = [ openssl systemd pam fuse libjpeg libopus xorg.libX11 xorg.libXfixes xorg.libXrandr ];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user