summary refs log tree commit diff
path: root/pkgs/tools/video
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2016-02-26 18:38:15 +0100
committerFranz Pletz <fpletz@fnordicwalking.de>2016-03-05 18:55:26 +0100
commitaff1f4ab948b921ceaf2b81610f2f82454302b4b (patch)
tree6e51e90a41409d56cfa084b9ca64921f2611fafc /pkgs/tools/video
parenta2e449e43e82e258b94c723d92a5e9af641967e7 (diff)
downloadnixlib-aff1f4ab948b921ceaf2b81610f2f82454302b4b.tar
nixlib-aff1f4ab948b921ceaf2b81610f2f82454302b4b.tar.gz
nixlib-aff1f4ab948b921ceaf2b81610f2f82454302b4b.tar.bz2
nixlib-aff1f4ab948b921ceaf2b81610f2f82454302b4b.tar.lz
nixlib-aff1f4ab948b921ceaf2b81610f2f82454302b4b.tar.xz
nixlib-aff1f4ab948b921ceaf2b81610f2f82454302b4b.tar.zst
nixlib-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/video')
-rw-r--r--pkgs/tools/video/mjpegtools/default.nix2
-rw-r--r--pkgs/tools/video/vncrec/default.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix
index 989649c580f2..bfffbae65b59 100644
--- a/pkgs/tools/video/mjpegtools/default.nix
+++ b/pkgs/tools/video/mjpegtools/default.nix
@@ -15,5 +15,5 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gtk libdv libjpeg libpng libX11 pkgconfig SDL SDL_gfx ];
 
-  hardening_format = false;
+  hardeningDisable = [ "format" ];
 }
diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix
index a16dc169b98e..81860f22e897 100644
--- a/pkgs/tools/video/vncrec/default.nix
+++ b/pkgs/tools/video/vncrec/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1yp6r55fqpdhc8cgrgh9i0mzxmkls16pgf8vfcpng1axr7cigyhc";
   };
 
-  hardening_format = false;
+  hardeningDisable = [ "format" ];
 
   buildInputs = [
     libX11 xproto imake gccmakedep libXt libXmu libXaw