mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-31 01:04:25 +00:00
* Removed seccureUser because -DNOMEMLOCK no longer seems to have any
effect in version 0.4. svn path=/nixpkgs/trunk/; revision=15632
This commit is contained in:
parent
5d72346338
commit
85e16ee19e
@ -1,26 +1,23 @@
|
|||||||
args : with args; with builderDefs;
|
{stdenv, fetchurl, libgcrypt}:
|
||||||
let localDefs = builderDefs.passthru.function ((rec {
|
|
||||||
src = /* put a fetchurl here */
|
|
||||||
fetchurl {
|
|
||||||
url = http://point-at-infinity.org/seccure/seccure-0.4.tar.gz;
|
|
||||||
sha256 = "33d690a7034ee349bce4911a8b7c73e6e3cd13a140f429e9e628d5cd5a3bb955";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [libgcrypt];
|
|
||||||
configureFlags = [];
|
|
||||||
doPatch = FullDepEntry (''
|
|
||||||
sed -e s@/usr/@$out/@g -i Makefile
|
|
||||||
ensureDir $out/bin $out/share/man/man1
|
|
||||||
'') ["minInit" "doUnpack" "defEnsureDir"];
|
|
||||||
}) // args);
|
|
||||||
in with localDefs;
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "seccure-"+version;
|
name = "seccure-0.4";
|
||||||
builder = writeScript (name + "-builder")
|
|
||||||
(textClosure localDefs
|
src = fetchurl {
|
||||||
["doPatch" doMakeInstall doForceShare doPropagate]);
|
url = "http://point-at-infinity.org/seccure/${name}.tar.gz";
|
||||||
meta = {
|
sha256 = "33d690a7034ee349bce4911a8b7c73e6e3cd13a140f429e9e628d5cd5a3bb955";
|
||||||
description = "Zero-configuration elliptic curve cryptography utility";
|
};
|
||||||
inherit src;
|
|
||||||
};
|
buildInputs = [libgcrypt];
|
||||||
|
|
||||||
|
preConfigure = ''
|
||||||
|
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
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = http://point-at-infinity.org/seccure/;
|
||||||
|
description = "Zero-configuration elliptic curve cryptography utility";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
@ -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;
|
||||||
};
|
};
|
||||||
|
@ -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";
|
||||||
|
Loading…
Reference in New Issue
Block a user