From 7001d91ba7170cc2426524e9f94d40a63a21c506 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 3 Mar 2008 23:32:50 +0000
Subject: [PATCH] Added seccureUser, uild variant that does not lock memory.

svn path=/nixpkgs/trunk/; revision=10938
---
 pkgs/tools/security/seccure/0.3.nix           | 2 +-
 pkgs/top-level/all-packages.nix               | 7 +++++++
 pkgs/top-level/template-composing+config.nix  | 2 +-
 pkgs/top-level/template-composing-builder.nix | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/seccure/0.3.nix b/pkgs/tools/security/seccure/0.3.nix
index 2b8dbdfec8f5..a42837cf60d9 100644
--- a/pkgs/tools/security/seccure/0.3.nix
+++ b/pkgs/tools/security/seccure/0.3.nix
@@ -12,7 +12,7 @@ args : with args; with builderDefs {src="";} null;
 			sed -e s@/usr/@$out/@g -i Makefile
 			ensureDir $out/bin $out/share/man/man1
 		'') ["minInit" "doUnpack" "defEnsureDir"];
-	}) null; /* null is a terminator for sumArgs */
+	}) args null; /* null is a terminator for sumArgs */
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "seccure-"+version;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8454664e709a..08f918ca621d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -860,6 +860,13 @@ rec {
 
   seccure = seccureFun null;
 
+  # seccure will override it (it is root-only, but
+  # more secure because of memory locking), but this 
+  # can be added to default system
+  seccureUser = lowPrio (seccureFun {
+    makeFlags = [" CFLAGS+=-DNOMEMLOCK "];
+  } null);
+
   sharutils = selectVersion ../tools/archivers/sharutils "4.6.3" {
     inherit fetchurl stdenv;
   };
diff --git a/pkgs/top-level/template-composing+config.nix b/pkgs/top-level/template-composing+config.nix
index 18282f53238d..56d5e1fa4837 100644
--- a/pkgs/top-level/template-composing+config.nix
+++ b/pkgs/top-level/template-composing+config.nix
@@ -9,7 +9,7 @@ args : with args; let localDefs = builderDefs (args // rec {
 		/* List consisiting of an even number of strings; "key" "value" */
 		configFlags = [
 		];
-	}) null; /* null is a terminator for sumArgs */
+	}) args null; /* null is a terminator for sumArgs */
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "${(abort "Specify name")}"+version;
diff --git a/pkgs/top-level/template-composing-builder.nix b/pkgs/top-level/template-composing-builder.nix
index e8d7ae4d7101..965bc082aba9 100644
--- a/pkgs/top-level/template-composing-builder.nix
+++ b/pkgs/top-level/template-composing-builder.nix
@@ -4,7 +4,7 @@ args : with args; with builderDefs {src="";} null;
 
 		buildInputs = [];
 		configureFlags = [];
-	}) null; /* null is a terminator for sumArgs */
+	}) args null; /* null is a terminator for sumArgs */
 	in with localDefs;
 stdenv.mkDerivation rec {
 	name = "${abort "Specify name"}-"+version;