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/development/libraries/opencv | |
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/development/libraries/opencv')
-rw-r--r-- | pkgs/development/libraries/opencv/3.x.nix | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/opencv/default.nix | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 16765083c55..4f0ed3cd0ea 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -49,8 +49,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - hardening_bindnow = false; - hardening_relro = false; + hardeningDisable = [ "bindnow" "relro" ]; meta = { description = "Open Computer Vision Library with more than 500 algorithms"; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index d5904e742b6..4259e9d4d69 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -20,8 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - hardening_bindnow = false; - hardening_relro = false; + hardeningDisable = [ "bindnow" "relro" ]; meta = { description = "Open Computer Vision Library with more than 500 algorithms"; |