From 119d6ad37957cf1764da3bdbfb00282a2b59de2e Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Thu, 21 Sep 2023 12:25:35 +0100 Subject: [PATCH] pkgconfig is now pkg-config --- pkgs/kernel/default.nix | 2 +- pkgs/mac80211/default.nix | 2 +- pkgs/swconfig/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/kernel/default.nix b/pkgs/kernel/default.nix index d6b8df4..d2fec55 100644 --- a/pkgs/kernel/default.nix +++ b/pkgs/kernel/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { hardeningDisable = ["all"]; nativeBuildInputs = [buildPackages.stdenv.cc] ++ (with buildPackages.pkgs; [ - rsync bc bison flex pkgconfig + rsync bc bison flex pkg-config openssl ncurses.all perl ]); CC = "${stdenv.cc.bintools.targetPrefix}gcc"; diff --git a/pkgs/mac80211/default.nix b/pkgs/mac80211/default.nix index a4d4757..ff36dde 100644 --- a/pkgs/mac80211/default.nix +++ b/pkgs/mac80211/default.nix @@ -94,7 +94,7 @@ let hardeningDisable = ["all"]; nativeBuildInputs = [buildPackages.stdenv.cc] ++ (with buildPackages.pkgs; - [bc bison flex pkgconfig openssl + [bc bison flex pkg-config openssl which kmod cpio ]); inherit CC CROSS_COMPILE; diff --git a/pkgs/swconfig/default.nix b/pkgs/swconfig/default.nix index ac95205..43cc8d6 100644 --- a/pkgs/swconfig/default.nix +++ b/pkgs/swconfig/default.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation { sha256 = "0hi2rj1a1fbvr5n1090q1zzigjyxmn643jzrwngw4ij0g82za3al"; }; name = "swconfig"; - buildInputs = [ buildPackages.pkgconfig ]; + buildInputs = [ buildPackages.pkg-config ]; nativeBuildInputs = [ libnl ]; CFLAGS="-O2 -Ifrom_kernel -I${libnl.dev}/include/libnl3"; LDFLAGS="-L${libnl.out}/lib";