From 5a732d153efdcb77919e913384e72b1333e28597 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Tue, 25 Feb 2025 01:32:47 +0900 Subject: [PATCH] nix: include fsu sources in dist build Signed-off-by: Ophestra --- flake.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index fcef274..16f93c0 100644 --- a/flake.nix +++ b/flake.nix @@ -97,11 +97,11 @@ packages = forAllSystems ( system: let - inherit (self.packages.${system}) fortify; + inherit (self.packages.${system}) fortify fsu; pkgs = nixpkgsFor.${system}; in { - default = self.packages.${system}.fortify; + default = fortify; fortify = pkgs.pkgsStatic.callPackage ./package.nix { inherit (pkgs) bubblewrap xdg-dbus-proxy glibc; }; @@ -114,7 +114,10 @@ export XDG_CACHE_HOME="$(mktemp -d)" # get a different workdir as go does not like /build - cd $(mktemp -d) && cp -r ${fortify.src}/. . && chmod -R +w . + cd $(mktemp -d) \ + && cp -r ${fortify.src}/. . \ + && chmod +w cmd && cp -r ${fsu.src}/. cmd/fsu/ \ + && chmod -R +w . export FORTIFY_VERSION="v${fortify.version}" ./dist/release.sh && mkdir $out && cp -v "dist/fortify-$FORTIFY_VERSION.tar.gz"* $out