diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-02-26 18:38:15 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-03-05 18:55:26 +0100 |
| commit | aff1f4ab948b921ceaf2b81610f2f82454302b4b (patch) | |
| tree | 6e51e90a41409d56cfa084b9ca64921f2611fafc /pkgs/tools/graphics/graphviz | |
| parent | a2e449e43e82e258b94c723d92a5e9af641967e7 (diff) | |
| download | nixpkgs-aff1f4ab948b921ceaf2b81610f2f82454302b4b.tar nixpkgs-aff1f4ab948b921ceaf2b81610f2f82454302b4b.tar.gz nixpkgs-aff1f4ab948b921ceaf2b81610f2f82454302b4b.tar.bz2 nixpkgs-aff1f4ab948b921ceaf2b81610f2f82454302b4b.tar.lz nixpkgs-aff1f4ab948b921ceaf2b81610f2f82454302b4b.tar.xz nixpkgs-aff1f4ab948b921ceaf2b81610f2f82454302b4b.tar.zst nixpkgs-aff1f4ab948b921ceaf2b81610f2f82454302b4b.zip | |
Use general hardening flag toggle lists
The following parameters are now available:
* hardeningDisable
To disable specific hardening flags
* hardeningEnable
To enable specific hardening flags
Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.
cc-wrapper supports the following flags:
* fortify
* stackprotector
* pie (disabled by default)
* pic
* strictoverflow
* format
* relro
* bindnow
Diffstat (limited to 'pkgs/tools/graphics/graphviz')
| -rw-r--r-- | pkgs/tools/graphics/graphviz/2.0.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/graphics/graphviz/2.32.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/graphics/graphviz/default.nix | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index e08b1309d41..6f236509a31 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -14,8 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd]; - hardening_format = false; - hardening_fortify = false; + hardeningDisable = [ "format" "fortify" ]; configureFlags = [ "--with-pngincludedir=${libpng}/include" diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index 7f11f076dcc..ede6624ac59 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (xorg == null) "--without-x"; - hardening_fortify = false; + hardeningDisable = [ "fortify" ]; preBuild = '' sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 9a9621dd784..82f958321bd 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "17l5czpvv5ilmg17frg0w4qwf89jzh2aglm9fgx0l0aakn6j7al1"; }; - hardening_fortify = false; + hardeningDisable = [ "fortify" ]; patches = [ ./0001-vimdot-lookup-vim-in-PATH.patch |