oath-toolkit: use autoreconfHook

+21 -16
+21 -16
pkgs/tools/security/oath-toolkit/default.nix
··· 1 - { stdenv, fetchgit, pam, xmlsec, autoconf, automake, libtool, pkgconfig, libxml2, gtkdoc, perl, gengetopt, bison, help2man }: 1 + { stdenv, fetchFromGitLab, pam, xmlsec, autoreconfHook, pkgconfig, libxml2, gtkdoc, perl, gengetopt, bison, help2man }: 2 2 3 3 let 4 4 securityDependency = 5 5 if stdenv.isDarwin then xmlsec 6 6 else pam; 7 - in 8 - stdenv.mkDerivation rec { 7 + 8 + in stdenv.mkDerivation rec { 9 9 name = "oath-toolkit-2.6.2"; 10 10 11 - src = fetchgit { 12 - url = "https://gitlab.com/oath-toolkit/oath-toolkit.git"; 11 + src = fetchFromGitLab { 12 + owner = "oath-toolkit"; 13 + repo = "oath-toolkit"; 14 + rev = "0dffdec9c5af5c89a5af43add29d8275eefe7414"; 13 15 sha256 = "0n2sl444723f1k0sjmc0mzdwslx51yxac39c2cx2bl3ykacgfv74"; 14 - rev = "0dffdec9c5af5c89a5af43add29d8275eefe7414"; 15 16 }; 16 17 17 - buildInputs = [ securityDependency automake autoconf libtool pkgconfig libxml2 gtkdoc perl gengetopt bison help2man ]; 18 + buildInputs = [ securityDependency libxml2 perl gengetopt bison ]; 19 + 20 + nativeBuildInputs = [ autoreconfHook gtkdoc help2man pkgconfig ]; 21 + 22 + # man file generation fails when true 23 + enableParallelBuilding = false; 18 24 19 25 configureFlags = [ "--disable-pskc" ]; 20 26 21 - preConfigure = '' 22 - # Replicate the steps from cfg.mk 23 - printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > liboath/man/Makefile.gdoc 24 - printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > libpskc/man/Makefile.gdoc 25 - touch ChangeLog 26 - autoreconf --force --install 27 + # Replicate the steps from cfg.mk 28 + preAutoreconf = '' 29 + printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > liboath/man/Makefile.gdoc 30 + printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > libpskc/man/Makefile.gdoc 31 + touch ChangeLog 27 32 ''; 28 33 29 - meta = { 34 + meta = with stdenv.lib; { 35 + description = "Components for building one-time password authentication systems"; 30 36 homepage = http://www.nongnu.org/oath-toolkit/; 31 - description = "Components for building one-time password authentication systems"; 32 - platforms = with stdenv.lib.platforms; linux ++ darwin; 37 + platforms = with platforms; linux ++ darwin; 33 38 }; 34 39 }