treewide: move pkg-config into nativeBuildInputs (#461728)

This commit is contained in:
Ben Siraphob
2025-11-17 17:05:42 +00:00
committed by GitHub
6 changed files with 12 additions and 8 deletions

View File

@@ -31,6 +31,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [
pkg-config
libGL
cairo
glib
@@ -50,7 +51,6 @@ stdenv.mkDerivation {
buildInputs = [
meson
ninja
pkg-config
scdoc
];

View File

@@ -19,8 +19,8 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "sha256-iSvDiae+A2hUok426Lj5TMn3Q9G+vH1G0jajP48PehQ=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
pkg-config
autoreconfHook
];

View File

@@ -19,13 +19,15 @@ stdenv.mkDerivation {
sha256 = "sha256-FB43DAjHBFgxdysoLzBXLxii52a2CCh1skZP/RTzfdc=";
};
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [
makeWrapper
pkg-config
];
buildInputs = [
clang
libffi
llvm
openssl
pkg-config
readline
];
sourceRoot = ''pil21'';

View File

@@ -23,6 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [
pkg-config
writableTmpDirAsHomeHook
gitMinimal
];
@@ -31,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
clang
go
llvm
pkg-config
];
env = {

View File

@@ -84,6 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
};
nativeBuildInputs = [
pkg-config
cmake
makeWrapper
qt6.wrapQtAppsHook
@@ -93,7 +94,6 @@ stdenv.mkDerivation (finalAttrs: {
bzip2
cryptopp
openssl
pkg-config
qt6.qtbase
qt6.qttools
xz

View File

@@ -19,7 +19,6 @@
rrtypes ? false,
zoneStats ? false,
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal,
configFile ? "/etc/nsd/nsd.conf",
}:
@@ -36,13 +35,16 @@ stdenv.mkDerivation rec {
substituteInPlace nsd-control-setup.sh.in --replace openssl ${openssl}/bin/openssl
'';
nativeBuildInputs = lib.optionals withSystemd [
pkg-config
];
buildInputs = [
libevent
openssl
]
++ lib.optionals withSystemd [
systemdMinimal
pkg-config
];
enableParallelBuilding = true;