Added seccureUser, uild variant that does not lock memory.

svn path=/nixpkgs/trunk/; revision=10938

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;

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;
   };

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;

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;