From 3d963b9f676af583c2ab5f29b87beb0c4800e764 Mon Sep 17 00:00:00 2001 From: Ophestra Umiker Date: Tue, 17 Sep 2024 23:15:33 +0900 Subject: [PATCH] nix: include package buildInputs in devShells Signed-off-by: Ophestra Umiker --- flake.nix | 8 +++++++- nixos.nix | 18 ++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index aa10f3d..fb88f99 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,13 @@ devShells = forAllSystems (system: { 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 + ''; }; }); }; diff --git a/nixos.nix b/nixos.nix index 0acb6bf..5a22fee 100644 --- a/nixos.nix +++ b/nixos.nix @@ -274,14 +274,16 @@ in link = source: "[ -d '${source}' ] && ln -sv '${source}' $out/share || true"; in shares - ++ optional (launcher.method != "simple" && (launcher.capability.wayland || launcher.capability.x11)) ( - pkgs.runCommand "${name}-share" { } '' - mkdir -p $out/share - ${link "${pkg}/share/applications"} - ${link "${pkg}/share/icons"} - ${link "${pkg}/share/man"} - '' - ) + ++ + optional (launcher.method != "simple" && (launcher.capability.wayland || launcher.capability.x11)) + ( + pkgs.runCommand "${name}-share" { } '' + mkdir -p $out/share + ${link "${pkg}/share/applications"} + ${link "${pkg}/share/icons"} + ${link "${pkg}/share/man"} + '' + ) ) (wrap user target.launchers) target.launchers) ) [ cfg.package ] cfg.target; };