public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell builder: allow disabling fortify hardening

Browse Source
This commit is contained in:
Robin Gloster 2016-02-09 14:41:11 +00:00
parent a462683d10
commit f8963e2ea7
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -44,6 +44,7 @@
, checkPhase ? "", preCheck ? "", postCheck ? "" , checkPhase ? "", preCheck ? "", postCheck ? ""
, preFixup ? "", postFixup ? "" , preFixup ? "", postFixup ? ""
, shellHook ? "" , shellHook ? ""
, hardening_fortify ? true
, coreSetup ? false # Use only core packages to build Setup.hs. , coreSetup ? false # Use only core packages to build Setup.hs.
, useCpphs ? false , useCpphs ? false
} @ args: } @ args:
@ -314,5 +315,6 @@ stdenv.mkDerivation ({
// optionalAttrs (preFixup != "") { inherit preFixup; } // optionalAttrs (preFixup != "") { inherit preFixup; }
// optionalAttrs (postFixup != "") { inherit postFixup; } // optionalAttrs (postFixup != "") { inherit postFixup; }
// optionalAttrs (dontStrip) { inherit dontStrip; } // optionalAttrs (dontStrip) { inherit dontStrip; }
// optionalAttrs (!hardening_fortify) { inherit hardening_fortify; }
// optionalAttrs (stdenv.isLinux) { LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } // optionalAttrs (stdenv.isLinux) { LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; }
) )