jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Removed seccureUser because -DNOMEMLOCK no longer seems to have any

Browse Source 
effect in version 0.4.

svn path=/nixpkgs/trunk/; revision=15632
This commit is contained in:
Eelco Dolstra 2009-05-18 11:24:16 +00:00
parent 5d72346338
commit 85e16ee19e
3 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/tools/security/seccure/0.4.nix
View File

@ -1,26 +1,23 @@
args : with args; with builderDefs; {stdenv, fetchurl, libgcrypt}:
let localDefs = builderDefs.passthru.function ((rec {
src = /* put a fetchurl here */ stdenv.mkDerivation rec {
fetchurl { name = "seccure-0.4";
url = http://point-at-infinity.org/seccure/seccure-0.4.tar.gz;
src = fetchurl {
url = "http://point-at-infinity.org/seccure/${name}.tar.gz";
sha256 = "33d690a7034ee349bce4911a8b7c73e6e3cd13a140f429e9e628d5cd5a3bb955"; sha256 = "33d690a7034ee349bce4911a8b7c73e6e3cd13a140f429e9e628d5cd5a3bb955";
}; };
buildInputs = [libgcrypt]; buildInputs = [libgcrypt];
configureFlags = [];
doPatch = FullDepEntry ('' preConfigure = ''
sed -e s@/usr/@$out/@g -i Makefile sed -e s@/usr/@$out/@g -i Makefile
sed -e 's@ln -f@ln -sf@g' -i Makefile
ensureDir $out/bin $out/share/man/man1 ensureDir $out/bin $out/share/man/man1
'') ["minInit" "doUnpack" "defEnsureDir"]; '';
}) // args);
in with localDefs;
stdenv.mkDerivation rec {
name = "seccure-"+version;
builder = writeScript (name + "-builder")
(textClosure localDefs
["doPatch" doMakeInstall doForceShare doPropagate]);
meta = { meta = {
homepage = http://point-at-infinity.org/seccure/;
description = "Zero-configuration elliptic curve cryptography utility"; description = "Zero-configuration elliptic curve cryptography utility";
inherit src;
}; };
} }

11
pkgs/top-level/all-packages.nix
View File

@ -1252,17 +1252,10 @@ let
inherit fetchurl stdenv ncurses; inherit fetchurl stdenv ncurses;
}; };
seccure = composedArgsAndFun (selectVersion ../tools/security/seccure "0.4") { seccure = import ../tools/security/seccure/0.4.nix {
inherit builderDefs libgcrypt; inherit fetchurl stdenv libgcrypt;
}; };
# 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 (seccure.passthru.function {
makeFlags = [" CFLAGS+=-DNOMEMLOCK "];
});
semantic = import ../applications/editors/emacs-modes/semantic { semantic = import ../applications/editors/emacs-modes/semantic {
inherit fetchurl stdenv emacs eieio; inherit fetchurl stdenv emacs eieio;
}; };

1
pkgs/top-level/release.nix
View File

@ -288,7 +288,6 @@ in {
screen = linux ++ darwin; screen = linux ++ darwin;
sdparm = linux; sdparm = linux;
seccure = linux; seccure = linux;
seccureUser = linux;
sharutils = all; sharutils = all;
slim = linux; slim = linux;
sloccount = allBut "i686-cygwin"; sloccount = allBut "i686-cygwin";