diff options
author | Peter Hoeg <peter@hoeg.com> | 2018-02-25 16:05:42 +0800 |
---|---|---|
committer | Peter Hoeg <peter@hoeg.com> | 2018-02-25 16:05:42 +0800 |
commit | f5d145a73eab9f8cef58aa534799474c3ee040bb (patch) | |
tree | ae597c29cdaf466a5c1eb34f29820e5f48775665 /pkgs/tools/security/oath-toolkit | |
parent | a60774c00b9936bebb977698493214790d1b2bdb (diff) | |
download | nixpkgs-f5d145a73eab9f8cef58aa534799474c3ee040bb.tar nixpkgs-f5d145a73eab9f8cef58aa534799474c3ee040bb.tar.gz nixpkgs-f5d145a73eab9f8cef58aa534799474c3ee040bb.tar.bz2 nixpkgs-f5d145a73eab9f8cef58aa534799474c3ee040bb.tar.lz nixpkgs-f5d145a73eab9f8cef58aa534799474c3ee040bb.tar.xz nixpkgs-f5d145a73eab9f8cef58aa534799474c3ee040bb.tar.zst nixpkgs-f5d145a73eab9f8cef58aa534799474c3ee040bb.zip |
oath-toolkit: use autoreconfHook
Diffstat (limited to 'pkgs/tools/security/oath-toolkit')
-rw-r--r-- | pkgs/tools/security/oath-toolkit/default.nix | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index e41ca6f0501..9bd3f372672 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -1,34 +1,39 @@ -{ stdenv, fetchgit, pam, xmlsec, autoconf, automake, libtool, pkgconfig, libxml2, gtkdoc, perl, gengetopt, bison, help2man }: +{ stdenv, fetchFromGitLab, pam, xmlsec, autoreconfHook, pkgconfig, libxml2, gtkdoc, perl, gengetopt, bison, help2man }: let securityDependency = if stdenv.isDarwin then xmlsec else pam; -in -stdenv.mkDerivation rec { + +in stdenv.mkDerivation rec { name = "oath-toolkit-2.6.2"; - src = fetchgit { - url = "https://gitlab.com/oath-toolkit/oath-toolkit.git"; - sha256 = "0n2sl444723f1k0sjmc0mzdwslx51yxac39c2cx2bl3ykacgfv74"; + src = fetchFromGitLab { + owner = "oath-toolkit"; + repo = "oath-toolkit"; rev = "0dffdec9c5af5c89a5af43add29d8275eefe7414"; + sha256 = "0n2sl444723f1k0sjmc0mzdwslx51yxac39c2cx2bl3ykacgfv74"; }; - buildInputs = [ securityDependency automake autoconf libtool pkgconfig libxml2 gtkdoc perl gengetopt bison help2man ]; + buildInputs = [ securityDependency libxml2 perl gengetopt bison ]; + + nativeBuildInputs = [ autoreconfHook gtkdoc help2man pkgconfig ]; + + # man file generation fails when true + enableParallelBuilding = false; configureFlags = [ "--disable-pskc" ]; - preConfigure = '' - # Replicate the steps from cfg.mk - printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > liboath/man/Makefile.gdoc - printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > libpskc/man/Makefile.gdoc - touch ChangeLog - autoreconf --force --install + # Replicate the steps from cfg.mk + preAutoreconf = '' + printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > liboath/man/Makefile.gdoc + printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > libpskc/man/Makefile.gdoc + touch ChangeLog ''; - meta = { - homepage = http://www.nongnu.org/oath-toolkit/; + meta = with stdenv.lib; { description = "Components for building one-time password authentication systems"; - platforms = with stdenv.lib.platforms; linux ++ darwin; + homepage = http://www.nongnu.org/oath-toolkit/; + platforms = with platforms; linux ++ darwin; }; } |