treewide: move pkg-config into nativeBuildInputs

This commit is contained in:
Ben Siraphob
2025-11-14 16:57:12 -05:00
parent 5eecbe3b20
commit 3d37c31dfc
6 changed files with 12 additions and 8 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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