From dc2247a3b56ba1bfef5bb48499eb0d36ad2e9ff3 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 4 Oct 2023 22:34:13 +0100 Subject: [PATCH] stdenvAdapters: add withDefaultHardeningFlags --- pkgs/stdenv/adapters.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index dd2987190718..aeacf96443d0 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -417,4 +417,18 @@ rec { "propagatedBuildInputs" ]); }); + + withDefaultHardeningFlags = defaultHardeningFlags: stdenv: let + bintools = let + bintools' = stdenv.cc.bintools; + in if bintools' ? override then (bintools'.override { + inherit defaultHardeningFlags; + }) else bintools'; + in + stdenv.override (old: { + cc = if stdenv.cc == null then null else stdenv.cc.override { + inherit bintools; + }; + allowedRequisites = lib.mapNullable (rs: rs ++ [ bintools ]) (stdenv.allowedRequisites or null); + }); }