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, autoconf213, fetchurl, fetchpatch, pkgconfig, nspr, perl, python2, zip }:
|
||||
{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkg-config, nspr, perl, python2, zip }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "spidermonkey";
|
||||
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
||||
|
||||
propagatedBuildInputs = [ nspr ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ] ++ lib.optional stdenv.isAarch32 autoconf213;
|
||||
nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isAarch32 autoconf213;
|
||||
buildInputs = [ perl python2 zip ];
|
||||
|
||||
postUnpack = "sourceRoot=\${sourceRoot}/js/src";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages
|
||||
{ stdenv, fetchurl, pkg-config, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages
|
||||
, libobjc }:
|
||||
|
||||
with stdenv.lib;
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ libffi readline icu zlib ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin libobjc;
|
||||
nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ];
|
||||
nativeBuildInputs = [ pkg-config perl python2 zip gnused_422 ];
|
||||
|
||||
postUnpack = "sourceRoot=\${sourceRoot}/js/src";
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, buildPackages
|
||||
{ stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, zip, buildPackages
|
||||
, which, readline, zlib, icu }:
|
||||
|
||||
with stdenv.lib;
|
||||
@@ -18,7 +18,7 @@ in stdenv.mkDerivation {
|
||||
setOutputFlags = false; # Configure script only understands --includedir
|
||||
|
||||
buildInputs = [ readline zlib icu ];
|
||||
nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ];
|
||||
nativeBuildInputs = [ autoconf213 pkg-config perl which python2 zip ];
|
||||
|
||||
patches = [
|
||||
# Fixed in 62.0
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, python3, zip, buildPackages
|
||||
{ stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, python3, zip, buildPackages
|
||||
, which, readline, zlib, icu, cargo, rustc, llvmPackages }:
|
||||
|
||||
with stdenv.lib;
|
||||
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf213
|
||||
pkgconfig
|
||||
pkg-config
|
||||
perl
|
||||
which
|
||||
python2
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, autoconf213
|
||||
, pkgconfig
|
||||
, pkg-config
|
||||
, perl
|
||||
, python3
|
||||
, zip
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
cargo
|
||||
llvmPackages.llvm # for llvm-objdump
|
||||
perl
|
||||
pkgconfig
|
||||
pkg-config
|
||||
python3
|
||||
rust-cbindgen
|
||||
rustc
|
||||
|
||||
Reference in New Issue
Block a user