From 33855381422932a208fa412bd4a96c0905aafdf1 Mon Sep 17 00:00:00 2001
From: Ophestra <cat@gensokyo.uk>
Date: Mon, 17 Mar 2025 09:49:18 +0900
Subject: nix: clean up flake outputs

Signed-off-by: Ophestra <cat@gensokyo.uk>
---
 test/default.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'test/default.nix')

diff --git a/test/default.nix b/test/default.nix
index 068ca709..d53dcfca 100644
--- a/test/default.nix
+++ b/test/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   nixosTest,
+  buildFHSEnv,
   writeShellScriptBin,
 
   system,
@@ -12,6 +13,21 @@ nixosTest {
   name = "fortify" + (if withRace then "-race" else "");
   nodes.machine =
     { options, pkgs, ... }:
+    let
+      fhs =
+        let
+          fortify = options.environment.fortify.package.default;
+        in
+        buildFHSEnv {
+          pname = "fortify-fhs";
+          inherit (fortify) version;
+          targetPkgs = _: fortify.targetPkgs;
+          extraOutputsToInstall = [ "dev" ];
+          profile = ''
+            export PKG_CONFIG_PATH="/usr/share/pkgconfig:$PKG_CONFIG_PATH"
+          '';
+        };
+    in
     {
       environment.systemPackages = [
         # For go tests:
@@ -21,7 +37,7 @@ nixosTest {
           cp -r "${self.packages.${system}.fortify.src}" "$WORK"
           chmod -R +w "$WORK"
           cd "$WORK"
-          ${self.packages.${system}.fhs}/bin/fortify-fhs -c \
+          ${fhs}/bin/fortify-fhs -c \
             'go generate ./... && go test ${if withRace then "-race" else "-count 16"} ./... && touch /tmp/go-test-ok'
         '')
       ];
-- 
cgit v1.3.1