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, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
|
||||
{ stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
|
||||
, libX11, cairo
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto libX11 cairo ]
|
||||
++ optional withMesa libGLU;
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
|
||||
{ stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
|
||||
, setfile
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
|
||||
++ optional withMesa libGLU
|
||||
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
propagatedBuildInputs = optional stdenv.isDarwin AGL;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig
|
||||
{ stdenv, fetchFromGitHub, fetchurl, pkg-config
|
||||
, libXinerama, libSM, libXxf86vm
|
||||
, gtk2, gtk3
|
||||
, xorgproto, gst_all_1, setfile
|
||||
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
++ optional withWebKit webkitgtk
|
||||
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
propagatedBuildInputs = optional stdenv.isDarwin AGL;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, pkgconfig
|
||||
, pkg-config
|
||||
, libXinerama
|
||||
, libSM
|
||||
, libXxf86vm
|
||||
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
|
||||
++ optional withWebKit webkitgtk
|
||||
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
propagatedBuildInputs = optional stdenv.isDarwin AGL;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user