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 @@
|
||||
{ lib, pkgconfig, rustPlatform, fetchFromGitHub, openssl }:
|
||||
{ lib, pkg-config, rustPlatform, fetchFromGitHub, openssl }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-tarpaulin";
|
||||
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{stdenv, fetchFromGitHub, cmake, pkgconfig, zlib, curl, elfutils, python, libiberty, libopcodes}:
|
||||
{stdenv, fetchFromGitHub, cmake, pkg-config, zlib, curl, elfutils, python, libiberty, libopcodes}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kcov";
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
preConfigure = "patchShebangs src/bin-to-c-source.py";
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ zlib curl elfutils python libiberty libopcodes ];
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchFromGitHub, rustPlatform, qt5, git, cmake
|
||||
, pkgconfig, makeWrapper }:
|
||||
, pkg-config, makeWrapper }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "panopticon";
|
||||
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ makeWrapper ];
|
||||
propagatedBuildInputs = with qt5; [
|
||||
qt5.qtbase
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ fetchFromGitHub, lib, mkDerivation
|
||||
# nativeBuildInputs
|
||||
, qmake, pkgconfig
|
||||
, qmake, pkg-config
|
||||
# Qt
|
||||
, qtbase, qtsvg, qtwebengine
|
||||
# buildInputs
|
||||
@@ -30,12 +30,12 @@ mkDerivation rec {
|
||||
--replace "include(lib_radare2.pri)" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ qmake pkgconfig python3 wrapQtAppsHook ];
|
||||
nativeBuildInputs = [ qmake pkg-config python3 wrapQtAppsHook ];
|
||||
propagatedBuildInputs = [ python3.pkgs.pyside2 ];
|
||||
buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 ];
|
||||
|
||||
qmakeFlags = with python3.pkgs; [
|
||||
"CONFIG+=link_pkgconfig"
|
||||
"CONFIG+=link_pkg-config"
|
||||
"PKGCONFIG+=r_core"
|
||||
# Leaving this enabled doesn't break build but generates errors
|
||||
# at runtime (to console) about being unable to load needed bits.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{stdenv, fetchFromGitHub
|
||||
, buildPackages
|
||||
, pkgconfig
|
||||
, pkg-config
|
||||
, libusb-compat-0_1, readline, libewf, perl, zlib, openssl
|
||||
, libuv, file, libzip, xxHash
|
||||
, gtk2 ? null, vte ? null, gtkdialog ? null
|
||||
@@ -78,7 +78,7 @@ let
|
||||
enableParallelBuilding = true;
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ file readline libusb-compat-0_1 libewf perl zlib openssl libuv ]
|
||||
++ optional useX11 [ gtkdialog vte gtk2 ]
|
||||
++ optional rubyBindings [ ruby ]
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
, autoconf
|
||||
, automake
|
||||
, libtool
|
||||
, pkgconfig
|
||||
, pkg-config
|
||||
, bison
|
||||
, flex
|
||||
, groff
|
||||
@@ -145,7 +145,7 @@ in stdenv.mkDerivation rec {
|
||||
autoconf
|
||||
automake
|
||||
libtool
|
||||
pkgconfig
|
||||
pkg-config
|
||||
bison
|
||||
flex
|
||||
groff
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchgit, sqlite, pkgconfig, perl
|
||||
{ stdenv, fetchgit, sqlite, pkg-config, perl
|
||||
, buildllvmsparse ? true
|
||||
, buildc2xml ? true
|
||||
, llvm ? null, libxml2 ? null
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "0r43qi6vryqg450fj73yjwbb7gzcgx64rhrhb3r1m6a252srijiy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [sqlite perl]
|
||||
++ stdenv.lib.optional buildllvmsparse llvm
|
||||
++ stdenv.lib.optional buildc2xml libxml2;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ fetchurl, stdenv, pkgconfig, libxml2, llvm }:
|
||||
{ fetchurl, stdenv, pkg-config, libxml2, llvm }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sparse-0.5.0";
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
sed -i Makefile -e "s|^PREFIX=.*$|PREFIX=$out|g"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libxml2 llvm ];
|
||||
doCheck = true;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user