diff options
author | Clemens Fruhwirth <clemens@endorphin.org> | 2018-02-22 13:08:20 +0100 |
---|---|---|
committer | Clemens Fruhwirth <clemens@endorphin.org> | 2018-02-22 23:26:35 +0100 |
commit | 483200692b134c3e8ec0a25d38dd3759f7e4f092 (patch) | |
tree | 9cbfd403b8cf567ab7005cea212ba45fae522d55 /pkgs/tools/security/oath-toolkit | |
parent | a43e33d0e48b2284ac3a2222d7f1965cef66f5e2 (diff) | |
download | nixpkgs-483200692b134c3e8ec0a25d38dd3759f7e4f092.tar nixpkgs-483200692b134c3e8ec0a25d38dd3759f7e4f092.tar.gz nixpkgs-483200692b134c3e8ec0a25d38dd3759f7e4f092.tar.bz2 nixpkgs-483200692b134c3e8ec0a25d38dd3759f7e4f092.tar.lz nixpkgs-483200692b134c3e8ec0a25d38dd3759f7e4f092.tar.xz nixpkgs-483200692b134c3e8ec0a25d38dd3759f7e4f092.tar.zst nixpkgs-483200692b134c3e8ec0a25d38dd3759f7e4f092.zip |
oath-toolkit: Switch over to git branch (GCC7 fix)
The git repo doesn't contain a configure script which adds a lot of build dependencies.
Diffstat (limited to 'pkgs/tools/security/oath-toolkit')
-rw-r--r-- | pkgs/tools/security/oath-toolkit/default.nix | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index 965ecda164b..e41ca6f0501 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pam, xmlsec }: +{ stdenv, fetchgit, pam, xmlsec, autoconf, automake, libtool, pkgconfig, libxml2, gtkdoc, perl, gengetopt, bison, help2man }: let securityDependency = @@ -8,13 +8,23 @@ in stdenv.mkDerivation rec { name = "oath-toolkit-2.6.2"; - src = fetchurl { - url = "mirror://savannah/oath-toolkit/${name}.tar.gz"; - sha256 = "182ah8vfbg0yhv6mh1b6ap944d0na6x7lpfkwkmzb6jl9gx4cd5h"; + src = fetchgit { + url = "https://gitlab.com/oath-toolkit/oath-toolkit.git"; + sha256 = "0n2sl444723f1k0sjmc0mzdwslx51yxac39c2cx2bl3ykacgfv74"; + rev = "0dffdec9c5af5c89a5af43add29d8275eefe7414"; }; + buildInputs = [ securityDependency automake autoconf libtool pkgconfig libxml2 gtkdoc perl gengetopt bison help2man ]; - buildInputs = [ securityDependency ]; + 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 + ''; meta = { homepage = http://www.nongnu.org/oath-toolkit/; |