From 8093548f673f27d5a144f1ec5b8b0887f13c5e72 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 16 Jun 2021 00:33:48 +0200 Subject: treewide: Replace pkgconfig with pkg-config This is another alias which got introduced in 2018, because the actual command is "pkg-config" and so the package name containing a dash is more reasonable. The reason why I'm doing this is because NixOS VM tests now disallow aliases and while the evaluation error in question only affected the "gnupg" test, I decided to change all occurences in the event that we might want to disallow aliases for things other than VM tests. Signed-off-by: aszlig Cc: @sternenseemann for "opam-env" --- pkgs/build-support/build-sandbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/build-support/build-sandbox') diff --git a/pkgs/build-support/build-sandbox/default.nix b/pkgs/build-support/build-sandbox/default.nix index 50b8f78f..3b42f4f3 100644 --- a/pkgs/build-support/build-sandbox/default.nix +++ b/pkgs/build-support/build-sandbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, closureInfo, nix, boost, dash }: +{ stdenv, lib, pkg-config, closureInfo, nix, boost, dash }: drv: { paths ? {}, ... }@attrs: @@ -97,7 +97,7 @@ in stdenv.mkDerivation ({ done ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost nix ]; makeFlags = [ "BINDIR=${drv}/bin" "EXTRA_NS_FLAGS=${extraNamespaceFlags}" ] ++ lib.optional allowBinSh "BINSH_EXECUTABLE=${dash}/bin/dash" -- cgit 1.4.1