From db84dad0dd9ad00f4dcb6008116379be59ad9441 Mon Sep 17 00:00:00 2001 From: Brian McGee Date: Wed, 5 Feb 2025 15:11:01 +0000 Subject: [PATCH] fix: path dependencies during runtime We weren't ensuring `systemd-detect-virt` was available at runtime. Just by chance it has been, but when implementing an activation script to detect report changes for `nixos-facter-modules` I noticed this issue. Signed-off-by: Brian McGee --- nix/packages/nixos-facter/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/nix/packages/nixos-facter/default.nix b/nix/packages/nixos-facter/default.nix index 72e71cd..23d7982 100644 --- a/nix/packages/nixos-facter/default.nix +++ b/nix/packages/nixos-facter/default.nix @@ -44,13 +44,10 @@ in nativeBuildInputs = with pkgs; [ gcc + makeWrapper pkg-config ]; - runtimeInputs = with pkgs; [ - util-linux - ]; - ldflags = [ "-s" "-w" @@ -59,6 +56,15 @@ in "-X github.com/numtide/nixos-facter/pkg/build.System=${pkgs.stdenv.hostPlatform.system}" ]; + postInstall = let + binPath = lib.makeBinPath (with pkgs; [ + systemdMinimal + ]); + in '' + wrapProgram "$out/bin/nixos-facter" \ + --prefix PATH : "${binPath}" + ''; + passthru.tests = (import ./tests) args; meta = with lib; {