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, bash, pkgconfig, autoconf, cpio, file, which, unzip
|
||||
{ stdenv, lib, fetchFromGitHub, bash, pkg-config, autoconf, cpio, file, which, unzip
|
||||
, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
|
||||
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
|
||||
, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap
|
||||
@@ -25,7 +25,7 @@ let
|
||||
sha256 = "11j2rqz9nag5y562g99py4p72f2kv4wwwyrnaspmrzax00wynyx7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoconf ];
|
||||
nativeBuildInputs = [ pkg-config autoconf ];
|
||||
buildInputs = [
|
||||
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
|
||||
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip
|
||||
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
|
||||
, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
|
||||
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
|
||||
, libXcursor, libXrandr, fontconfig, openjdk11
|
||||
@@ -22,7 +22,7 @@ let
|
||||
sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoconf ];
|
||||
nativeBuildInputs = [ pkg-config autoconf ];
|
||||
buildInputs = [
|
||||
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
|
||||
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip
|
||||
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
|
||||
, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
|
||||
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
|
||||
, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap
|
||||
@@ -22,7 +22,7 @@ let
|
||||
sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoconf ];
|
||||
nativeBuildInputs = [ pkg-config autoconf ];
|
||||
buildInputs = [
|
||||
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
|
||||
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, pkgconfig, lndir, bash, cpio, file, which, unzip, zip
|
||||
{ stdenv, lib, fetchurl, pkg-config, lndir, bash, cpio, file, which, unzip, zip
|
||||
, cups, freetype, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib
|
||||
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
|
||||
, libjpeg, giflib
|
||||
@@ -83,7 +83,7 @@ let
|
||||
|
||||
outputs = [ "out" "jre" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig lndir ];
|
||||
nativeBuildInputs = [ pkg-config lndir ];
|
||||
buildInputs = [
|
||||
cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib
|
||||
libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, writeText, gradleGen, pkgconfig, perl, cmake
|
||||
{ stdenv, lib, fetchurl, writeText, gradleGen, pkg-config, perl, cmake
|
||||
, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg_3, python, ruby
|
||||
, openjdk11-bootstrap }:
|
||||
|
||||
@@ -20,7 +20,7 @@ let
|
||||
};
|
||||
|
||||
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ];
|
||||
nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ];
|
||||
nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen
|
||||
, pkgconfig, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib
|
||||
, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib
|
||||
, ffmpeg_3, python, ruby }:
|
||||
|
||||
let
|
||||
@@ -22,7 +22,7 @@ let
|
||||
};
|
||||
|
||||
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ];
|
||||
nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ];
|
||||
nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user