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, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl
|
||||
{ stdenv, lib, fetchurl, cmake, ninja, pkg-config, libiconv, libintl
|
||||
, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg, fetchpatch
|
||||
, withData ? true, poppler_data
|
||||
, qt5Support ? false, qtbase ? null
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
++ optional qt5Support qtbase
|
||||
++ optional introspectionSupport gobject-introspection;
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkgconfig ];
|
||||
nativeBuildInputs = [ cmake ninja pkg-config ];
|
||||
|
||||
# Not sure when and how to pass it. It seems an upstream bug anyway.
|
||||
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, fetchpatch, cmake, ninja, pkgconfig, libiconv, libintl
|
||||
{ stdenv, lib, fetchurl, fetchpatch, cmake, ninja, pkg-config, libiconv, libintl
|
||||
, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
|
||||
, withData ? true, poppler_data
|
||||
, qt5Support ? false, qtbase ? null
|
||||
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
++ optional utils nss
|
||||
++ optional introspectionSupport gobject-introspection;
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkgconfig ];
|
||||
nativeBuildInputs = [ cmake ninja pkg-config ];
|
||||
|
||||
# Workaround #54606
|
||||
preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
|
||||
Reference in New Issue
Block a user