From 7742a5f5b8f5c10872497180561f661aaf1ae0f0 Mon Sep 17 00:00:00 2001 From: Philipp Jungkamp Date: Tue, 13 Jun 2023 10:47:51 +0200 Subject: [PATCH] packaging-nix: disable hardening cxx flags in devShells Signed-off-by: Philipp Jungkamp --- packaging/nix/flake.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packaging/nix/flake.nix b/packaging/nix/flake.nix index 70c21e9bf..b5a93cafd 100644 --- a/packaging/nix/flake.nix +++ b/packaging/nix/flake.nix @@ -117,20 +117,19 @@ devShells = forSupportedSystems ( system: let pkgs = pkgsFor system; - shellHook = '' - [ -z "$PS1" ] || exec $SHELL - ''; + shellHook = ''[ -z "$PS1" ] || exec "$SHELL"''; + hardeningDisable = ["all"]; in rec { default = full; minimal = pkgs.mkShell { - inherit shellHook; + inherit shellHook hardeningDisable; name = "minimal"; inputsFrom = [pkgs.villas-minimal]; }; full = pkgs.mkShell { - inherit shellHook; + inherit shellHook hardeningDisable; name = "full"; inputsFrom = [pkgs.villas]; };