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
@@ -2,7 +2,7 @@
|
||||
stdenv, lib,
|
||||
src, patches, version, qtCompatVersion,
|
||||
|
||||
coreutils, bison, flex, gdb, gperf, lndir, perl, pkgconfig, python3,
|
||||
coreutils, bison, flex, gdb, gperf, lndir, perl, pkg-config, python3,
|
||||
which,
|
||||
# darwin support
|
||||
darwin, libiconv,
|
||||
@@ -87,7 +87,7 @@ stdenv.mkDerivation {
|
||||
++ lib.optional (postgresql != null) postgresql;
|
||||
|
||||
nativeBuildInputs =
|
||||
[ bison flex gperf lndir perl pkgconfig which ];
|
||||
[ bison flex gperf lndir perl pkg-config which ];
|
||||
|
||||
propagatedNativeBuildInputs = [ lndir ];
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ qtModule, qtbase, qtdeclarative, pkgconfig }:
|
||||
{ qtModule, qtbase, qtdeclarative, pkg-config }:
|
||||
|
||||
qtModule {
|
||||
name = "qtgamepad";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
buildInputs = [ ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ qtModule, stdenv, qtbase, qtdeclarative, pkgconfig
|
||||
{ qtModule, stdenv, qtbase, qtdeclarative, pkg-config
|
||||
, alsaLib, gstreamer, gst-plugins-base, libpulseaudio, wayland
|
||||
}:
|
||||
|
||||
@@ -7,7 +7,7 @@ with stdenv.lib;
|
||||
qtModule {
|
||||
name = "qtmultimedia";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gstreamer gst-plugins-base libpulseaudio ]
|
||||
++ optional (stdenv.isLinux) alsaLib
|
||||
++ optional (versionAtLeast qtbase.version "5.14.0" && stdenv.isLinux) wayland;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ qtModule, qtbase, qtquickcontrols, wayland, pkgconfig }:
|
||||
{ qtModule, qtbase, qtquickcontrols, wayland, pkg-config }:
|
||||
|
||||
qtModule {
|
||||
name = "qtwayland";
|
||||
qtInputs = [ qtbase qtquickcontrols ];
|
||||
buildInputs = [ wayland ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ qtModule
|
||||
, qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel
|
||||
|
||||
, bison, coreutils, flex, git, gperf, ninja, pkgconfig, python2, which
|
||||
, bison, coreutils, flex, git, gperf, ninja, pkg-config, python2, which
|
||||
|
||||
, xorg, libXcursor, libXScrnSaver, libXrandr, libXtst
|
||||
, fontconfig, freetype, harfbuzz, icu, dbus, libdrm
|
||||
@@ -24,7 +24,7 @@ qtModule {
|
||||
name = "qtwebengine";
|
||||
qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ];
|
||||
nativeBuildInputs = [
|
||||
bison coreutils flex git gperf ninja pkgconfig python2 which gn
|
||||
bison coreutils flex git gperf ninja pkg-config python2 which gn
|
||||
] ++ optional stdenv.isDarwin xcbuild;
|
||||
doCheck = true;
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
, qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel
|
||||
, fontconfig, gtk2, libwebp, libxml2, libxslt
|
||||
, sqlite, systemd, glib, gst_all_1, cmake
|
||||
, bison, flex, gdb, gperf, perl, pkgconfig, python2, ruby
|
||||
, bison, flex, gdb, gperf, perl, pkg-config, python2, ruby
|
||||
, darwin
|
||||
, flashplayerFix ? false
|
||||
}:
|
||||
@@ -31,7 +31,7 @@ qtModule {
|
||||
++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ ICU OpenGL ])
|
||||
++ optional usingAnnulenWebkitFork hyphen;
|
||||
nativeBuildInputs = [
|
||||
bison flex gdb gperf perl pkgconfig python2 ruby
|
||||
bison flex gdb gperf perl pkg-config python2 ruby
|
||||
] ++ optional usingAnnulenWebkitFork cmake;
|
||||
|
||||
cmakeFlags = optionals usingAnnulenWebkitFork ([ "-DPORT=Qt" ]
|
||||
|
||||
Reference in New Issue
Block a user