From aff1f4ab948b921ceaf2b81610f2f82454302b4b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 26 Feb 2016 18:38:15 +0100
Subject: 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
---
 pkgs/servers/nosql/mongodb/default.nix | 2 +-
 pkgs/servers/nosql/riak/1.3.1.nix      | 2 +-
 pkgs/servers/nosql/riak/2.1.1.nix      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/servers/nosql')

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 \
-- 
cgit 1.4.1