diff --git a/pkgs/tools/security/seccure/0.4.nix b/pkgs/tools/security/seccure/0.4.nix index 79be594cee1..0a1452e5355 100644 --- a/pkgs/tools/security/seccure/0.4.nix +++ b/pkgs/tools/security/seccure/0.4.nix @@ -1,26 +1,23 @@ -args : with args; with builderDefs; - 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"; - }; +{stdenv, fetchurl, libgcrypt}: - 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 { - name = "seccure-"+version; - builder = writeScript (name + "-builder") - (textClosure localDefs - ["doPatch" doMakeInstall doForceShare doPropagate]); - meta = { - description = "Zero-configuration elliptic curve cryptography utility"; - inherit src; - }; + name = "seccure-0.4"; + + src = fetchurl { + url = "http://point-at-infinity.org/seccure/${name}.tar.gz"; + sha256 = "33d690a7034ee349bce4911a8b7c73e6e3cd13a140f429e9e628d5cd5a3bb955"; + }; + + 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"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e47c8430f41..2622e88a4b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1252,17 +1252,10 @@ let inherit fetchurl stdenv ncurses; }; - seccure = composedArgsAndFun (selectVersion ../tools/security/seccure "0.4") { - inherit builderDefs libgcrypt; + seccure = import ../tools/security/seccure/0.4.nix { + 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 { inherit fetchurl stdenv emacs eieio; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 4b348b74725..2e4b1027bfd 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -288,7 +288,6 @@ in { screen = linux ++ darwin; sdparm = linux; seccure = linux; - seccureUser = linux; sharutils = all; slim = linux; sloccount = allBut "i686-cygwin";