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/servers/nosql | |
| parent | a2e449e43e82e258b94c723d92a5e9af641967e7 (diff) | |
| download | nixlib-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/servers/nosql')
| -rw-r--r-- | pkgs/servers/nosql/mongodb/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/nosql/riak/1.3.1.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/nosql/riak/2.1.1.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 141e8e0929d1..913b312a54a3 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -80,7 +80,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; - hardening_pie = true; + hardeningEnable = [ "pie" ]; meta = { description = "a scalable, high-performance, open source NoSQL database"; diff --git a/pkgs/servers/nosql/riak/1.3.1.nix b/pkgs/servers/nosql/riak/1.3.1.nix index ffa2056d5a9c..565ed226ab4f 100644 --- a/pkgs/servers/nosql/riak/1.3.1.nix +++ b/pkgs/servers/nosql/riak/1.3.1.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ ./riak-1.3.1.patch ./riak-admin-1.3.1.patch ]; - hardening_format = false; + hardeningDisable = [ "format" ]; postUnpack = '' mkdir -p $sourceRoot/deps/eleveldb/c_src/leveldb diff --git a/pkgs/servers/nosql/riak/2.1.1.nix b/pkgs/servers/nosql/riak/2.1.1.nix index 05cf4270f9f8..b66e99f0afbe 100644 --- a/pkgs/servers/nosql/riak/2.1.1.nix +++ b/pkgs/servers/nosql/riak/2.1.1.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = srcs.riak; - hardening_format = false; + hardeningDisable = [ "format" ]; postPatch = '' sed -i deps/node_package/priv/base/env.sh \ |