diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2024-03-12 18:41:57 +0100 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2024-03-12 18:41:57 +0100 |
| commit | cac23248b1f873d10f4604b0f0facea81987367b (patch) | |
| tree | 38767c21a3f06bc64616e181a09803aeac09be21 /pkgs/stdenv/generic | |
| parent | 464d8c4a6c6282ea51e80b695f4d0eb39dd24b96 (diff) | |
| download | nixlib-cac23248b1f873d10f4604b0f0facea81987367b.tar nixlib-cac23248b1f873d10f4604b0f0facea81987367b.tar.gz nixlib-cac23248b1f873d10f4604b0f0facea81987367b.tar.bz2 nixlib-cac23248b1f873d10f4604b0f0facea81987367b.tar.lz nixlib-cac23248b1f873d10f4604b0f0facea81987367b.tar.xz nixlib-cac23248b1f873d10f4604b0f0facea81987367b.tar.zst nixlib-cac23248b1f873d10f4604b0f0facea81987367b.zip | |
make-derivation.nix: Float out knownHardeningFlags
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 36d34b796f90..b86cfd1f5927 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -110,6 +110,20 @@ let makeDerivationExtensible (self: attrs // (if builtins.isFunction f0 || f0?__functor then f self attrs else f0))) attrs; + knownHardeningFlags = [ + "bindnow" + "format" + "fortify" + "fortify3" + "pic" + "pie" + "relro" + "stackprotector" + "strictoverflow" + "trivialautovarinit" + "zerocallusedregs" + ]; + makeDerivationArgument = @@ -235,19 +249,6 @@ let # disabling fortify implies fortify3 should also be disabled then unique (hardeningDisable ++ [ "fortify3" ]) else hardeningDisable; - knownHardeningFlags = [ - "bindnow" - "format" - "fortify" - "fortify3" - "pic" - "pie" - "relro" - "stackprotector" - "strictoverflow" - "trivialautovarinit" - "zerocallusedregs" - ]; defaultHardeningFlags = (if stdenv.hasCC then stdenv.cc else {}).defaultHardeningFlags or # fallback safe-ish set of flags |