From 76ddcd184702162b0513b1fce1d4ee2f95b4406d Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Mon, 19 Aug 2024 22:48:22 +0200 Subject: [PATCH] hwinfo: add pkg-config validation --- pkgs/by-name/hw/hwinfo/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/hw/hwinfo/package.nix b/pkgs/by-name/hw/hwinfo/package.nix index b6bb806a393a..ff2d6a351f60 100644 --- a/pkgs/by-name/hw/hwinfo/package.nix +++ b/pkgs/by-name/hw/hwinfo/package.nix @@ -12,6 +12,7 @@ binutils, writeText, runCommand, + validatePkgConfig, }: stdenv.mkDerivation (finalAttrs: { @@ -25,7 +26,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-YAhsnE1DJ5UlYAuhDxS/5IpfIJB6DrhCT3E0YiKENjU="; }; - nativeBuildInputs = [ flex ]; + nativeBuildInputs = [ + flex + validatePkgConfig + ]; buildInputs = [ libuuid @@ -62,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { version = testers.testVersion { package = finalAttrs.finalPackage; }; + pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; no-usr = testers.testEqualContents { assertion = "There should be no /usr/ paths in the binaries"; # There is a bash script that refers to lshal, which is deprecated and not available in Nixpkgs. @@ -82,5 +87,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ bobvanderlinden ]; platforms = platforms.linux; mainProgram = "hwinfo"; + pkgConfigModules = [ "hwinfo" ]; }; })