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 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, git, doxygen, graphviz
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, git, doxygen, graphviz
|
||||
, boost, miniupnpc, openssl, unbound, cppzmq
|
||||
, zeromq, pcsclite, readline, libsodium
|
||||
}:
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "07d87n1j4dc9gfwj6xy5jdpryn45095xdh961g6xjnjzc5fivjch";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig git doxygen graphviz ];
|
||||
nativeBuildInputs = [ cmake pkg-config git doxygen graphviz ];
|
||||
|
||||
buildInputs = [
|
||||
boost miniupnpc openssl unbound
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, openssl, db53, boost
|
||||
{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, cmake, openssl, db53, boost
|
||||
, zlib, miniupnpc, qtbase ? null , qttools ? null, util-linux, protobuf, qrencode, libevent
|
||||
, withGui, python3, jemalloc, zeromq4 }:
|
||||
|
||||
@@ -18,7 +18,7 @@ mkDerivation rec {
|
||||
|
||||
patches = [ ./fix-bitcoin-qt-build.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
buildInputs = [ openssl db53 boost zlib python3 jemalloc zeromq4
|
||||
miniupnpc util-linux protobuf libevent ]
|
||||
++ optionals withGui [ qtbase qttools qrencode ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, openssl, db48, boost
|
||||
, zlib, miniupnpc, qtbase ? null, qttools ? null, util-linux, protobuf, qrencode, libevent
|
||||
, withGui }:
|
||||
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "06ij9v7zbdnhxq9429nnxiw655cp8idldj18l7fmj94gqx07n5vh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [ openssl db48 boost zlib
|
||||
miniupnpc util-linux protobuf libevent ]
|
||||
++ optionals withGui [ qtbase qttools qrencode ];
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
, libevent
|
||||
, autoreconfHook
|
||||
, db4
|
||||
, pkgconfig
|
||||
, pkg-config
|
||||
, protobuf
|
||||
, hexdump
|
||||
, zeromq
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkgconfig
|
||||
pkg-config
|
||||
hexdump
|
||||
] ++ optionals withGui [
|
||||
wrapQtAppsHook
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkgconfig
|
||||
, pkg-config
|
||||
, autoreconfHook
|
||||
, db5
|
||||
, openssl
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0c8k1154kcwz6q2803wx0zigvqaij1fi5akgfqlj3yl57jjw48jj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [ openssl db5 openssl util-linux
|
||||
protobuf boost zlib miniupnpc libevent ];
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, openssl, db48, boost
|
||||
, zlib, miniupnpc, util-linux, protobuf, qrencode, libevent, python3
|
||||
, withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null
|
||||
, Foundation, ApplicationServices, AppKit }:
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "018a22zbvjqky0whizmgxzscmna0sh2xqgyw02yjk8qj4yi0zp8c";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook python3 ]
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook python3 ]
|
||||
++ optionals withGui [ wrapQtAppsHook qttools ];
|
||||
buildInputs = [ openssl db48 boost zlib
|
||||
miniupnpc util-linux protobuf libevent ]
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, pkgconfig
|
||||
, pkg-config
|
||||
, openssl
|
||||
}:
|
||||
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0qkmf89z2n7s95vhw3n9vh9dbi14zy4vqw3ffdh1w911jwm5ry3z";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkgconfig
|
||||
, pkg-config
|
||||
, libtool
|
||||
, autoconf
|
||||
, automake
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0l1ms3nxnjzh4mpiadikvngcr9k3jnjqy3yna207za0va0c28dj5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ autoconf automake libtool curl ncurses ocl-icd opencl-headers
|
||||
xorg.libX11 xorg.libXext xorg.libXinerama jansson libusb1 ];
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, python3, pkgconfig, which, libtool, autoconf, automake,
|
||||
{ lib, stdenv, python3, pkg-config, which, libtool, autoconf, automake,
|
||||
autogen, sqlite, gmp, zlib, fetchurl, unzip, fetchpatch, gettext }:
|
||||
|
||||
with lib;
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ autoconf autogen automake libtool pkgconfig which unzip gettext ];
|
||||
nativeBuildInputs = [ autoconf autogen automake libtool pkg-config which unzip gettext ];
|
||||
buildInputs =
|
||||
let py3 = python3.withPackages (p: [ p.Mako ]);
|
||||
in [ sqlite gmp zlib py3 ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ fetchFromGitHub, lib, stdenv, pkgconfig, autoreconfHook
|
||||
{ fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook
|
||||
, openssl, db48, boost, zlib, miniupnpc
|
||||
, qrencode, glib, protobuf, yasm, libevent
|
||||
, util-linux
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0l1gcj2xf2bal9ph9y11x8yd28fd25f55f48xbm45bfw3ij7nbaa";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [ glib openssl db48 yasm boost zlib libevent
|
||||
miniupnpc protobuf qrencode util-linux ];
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost
|
||||
, lmdb, miniupnpc, readline }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1v8b9wbmqbpyf4jpc0v276qzk3hc5fpddcmwvv5k5yfi30nmbh5c";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ boost miniupnpc openssl lmdb unbound readline ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
, libevent
|
||||
, autoreconfHook
|
||||
, db4
|
||||
, pkgconfig
|
||||
, pkg-config
|
||||
, protobuf
|
||||
, hexdump
|
||||
, zeromq
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkgconfig
|
||||
pkg-config
|
||||
hexdump
|
||||
] ++ optionals withGui [
|
||||
wrapQtAppsHook
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv , fetchFromGitHub
|
||||
, pkgconfig, autoreconfHook
|
||||
, pkg-config, autoreconfHook
|
||||
, db5, openssl, boost, zlib, miniupnpc, libevent
|
||||
, protobuf, util-linux, qt4, qrencode
|
||||
, withGui }:
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1gw46q63mjzwvb17ck6p1bap2xpdrap08szw2kjhasa3yvd5swyy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [ openssl db5 openssl util-linux
|
||||
protobuf boost zlib miniupnpc libevent ]
|
||||
++ optionals withGui [ qt4 qrencode ];
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, mkDerivation, fetchFromGitHub
|
||||
, pkgconfig, autoreconfHook
|
||||
, pkg-config, autoreconfHook
|
||||
, openssl, db48, boost, zlib, miniupnpc
|
||||
, glib, protobuf, util-linux, qrencode
|
||||
, AppKit
|
||||
@@ -22,7 +22,7 @@ mkDerivation rec {
|
||||
sha256 = "11753zhyx1kmrlljc6kbjwrcb06dfcrsqvmw3iaki9a132qk6l5c";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [ openssl db48 boost zlib zeromq
|
||||
miniupnpc glib protobuf util-linux libevent ]
|
||||
++ optionals stdenv.isDarwin [ AppKit ]
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, unbound, openssl, boost
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost
|
||||
, lmdb, miniupnpc, readline }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0l6i21wkq5f6z8xr756i7vqgkzk7lixaa31ydy34fkfcqxppgxz3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ boost miniupnpc openssl lmdb unbound readline ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, wrapQtAppsHook, makeDesktopItem
|
||||
, fetchFromGitHub
|
||||
, cmake, qttools, pkgconfig
|
||||
, cmake, qttools, pkg-config
|
||||
, qtbase, qtdeclarative, qtgraphicaleffects
|
||||
, qtmultimedia, qtxmlpatterns
|
||||
, qtquickcontrols, qtquickcontrols2
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake pkgconfig wrapQtAppsHook
|
||||
cmake pkg-config wrapQtAppsHook
|
||||
(getDev qttools)
|
||||
];
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
, cmake, pkgconfig
|
||||
, cmake, pkg-config
|
||||
, boost, miniupnpc, openssl, unbound
|
||||
, zeromq, pcsclite, readline, libsodium, hidapi
|
||||
, randomx, rapidjson
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
cp -r . $source
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
boost miniupnpc openssl unbound
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, qrencode, hexdump
|
||||
{ lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkg-config, qt4, protobuf, qrencode, hexdump
|
||||
, withGui }:
|
||||
|
||||
with lib;
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkgconfig
|
||||
pkg-config
|
||||
hexdump
|
||||
];
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook, boost, libGL
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, boost, libGL
|
||||
, qtbase}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
optionToFlag = name: value: "-D${name}=${value}";
|
||||
in lib.mapAttrsToList optionToFlag options;
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ];
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
buildInputs = [ boost libGL qtbase ];
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
, libevent
|
||||
, miniupnpc
|
||||
, openssl
|
||||
, pkgconfig
|
||||
, pkg-config
|
||||
, zeromq
|
||||
, zlib
|
||||
, unixtools
|
||||
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "11y5q2srkh6r2samppjb5mg6hl79y16j2lj1r23p0968vb9c45kl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [ openssl db48 boost zlib miniupnpc libevent zeromq unixtools.hexdump python3 ];
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ fetchFromGitHub, lib, stdenv, pkgconfig, autoreconfHook, wrapQtAppsHook ? null
|
||||
{ fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook, wrapQtAppsHook ? null
|
||||
, openssl, db48, boost, zlib, miniupnpc, gmp
|
||||
, qrencode, glib, protobuf, yasm, libevent
|
||||
, util-linux, qtbase ? null, qttools ? null
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "03ndk46h6093v8s18d5iffz48zhlshq7jrk6vgpjfs6z2iqgd2sy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ];
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ];
|
||||
buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf util-linux ]
|
||||
++ optionals withGui [ qtbase qttools qrencode ];
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchgit, autoconf, libtool, automake, pkgconfig, git
|
||||
{ lib, stdenv, fetchgit, autoconf, libtool, automake, pkg-config, git
|
||||
, bison, flex, postgresql }:
|
||||
|
||||
let
|
||||
@@ -16,7 +16,7 @@ in stdenv.mkDerivation {
|
||||
leaveDotGit = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ autoconf automake libtool git ];
|
||||
|
||||
propagatedBuildInputs = [ bison flex postgresql ];
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
, libevent
|
||||
, autoreconfHook
|
||||
, db4
|
||||
, pkgconfig
|
||||
, pkg-config
|
||||
, protobuf
|
||||
, hexdump
|
||||
, zeromq
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkgconfig
|
||||
pkg-config
|
||||
hexdump
|
||||
] ++ optionals withGui [
|
||||
wrapQtAppsHook
|
||||
|
||||
Reference in New Issue
Block a user