security
/
fortify
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

nix: include package buildInputs in devShells 

Signed-off-by: Ophestra Umiker <cat@ophivana.moe>
This commit is contained in:
Ophestra Umiker 2024-09-17 23:15:33 +09:00
parent 4b7d616862
commit 3d963b9f67
Signed by: cat
SSH Key Fingerprint: SHA256:6kgHEIjF2pWUE8e8JwjVV1IvwgjV6z9J3+ksLiloDfQ
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.nix
View File

@ -34,7 +34,13 @@
devShells = forAllSystems (system: { devShells = forAllSystems (system: {
default = nixpkgsFor.${system}.mkShell { default = nixpkgsFor.${system}.mkShell {
buildInputs = with nixpkgsFor.${system}; [ self.packages.${system}.fortify ]; buildInputs =
with nixpkgsFor.${system};
[ self.packages.${system}.fortify ] ++ self.packages.${system}.fortify.buildInputs;
shellHook = ''
which fortify
'';
}; };
}); });
}; };

18
nixos.nix
View File

@ -274,14 +274,16 @@ in
link = source: "[ -d '${source}' ] && ln -sv '${source}' $out/share || true"; link = source: "[ -d '${source}' ] && ln -sv '${source}' $out/share || true";
in in
shares shares
++ optional (launcher.method != "simple" && (launcher.capability.wayland || launcher.capability.x11)) ( ++
pkgs.runCommand "${name}-share" { } '' optional (launcher.method != "simple" && (launcher.capability.wayland || launcher.capability.x11))
mkdir -p $out/share (
${link "${pkg}/share/applications"} pkgs.runCommand "${name}-share" { } ''
${link "${pkg}/share/icons"} mkdir -p $out/share
${link "${pkg}/share/man"} ${link "${pkg}/share/applications"}
'' ${link "${pkg}/share/icons"}
) ${link "${pkg}/share/man"}
''
)
) (wrap user target.launchers) target.launchers) ) (wrap user target.launchers) target.launchers)
) [ cfg.package ] cfg.target; ) [ cfg.package ] cfg.target;
}; };