diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-02-23 11:00:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-23 11:00:13 +0000 |
| commit | 33115bde4be9dfb0ad4781c3ea1494f2f6b4e7a8 (patch) | |
| tree | 9f24849615ded7f87782d05dbe60b6a9fe2a532f /pkgs | |
| parent | cb025f228534c7519a016a5eac6523f961f366cf (diff) | |
| parent | 483200692b134c3e8ec0a25d38dd3759f7e4f092 (diff) | |
| download | nixlib-33115bde4be9dfb0ad4781c3ea1494f2f6b4e7a8.tar nixlib-33115bde4be9dfb0ad4781c3ea1494f2f6b4e7a8.tar.gz nixlib-33115bde4be9dfb0ad4781c3ea1494f2f6b4e7a8.tar.bz2 nixlib-33115bde4be9dfb0ad4781c3ea1494f2f6b4e7a8.tar.lz nixlib-33115bde4be9dfb0ad4781c3ea1494f2f6b4e7a8.tar.xz nixlib-33115bde4be9dfb0ad4781c3ea1494f2f6b4e7a8.tar.zst nixlib-33115bde4be9dfb0ad4781c3ea1494f2f6b4e7a8.zip | |
Merge pull request #35389 from clefru/oath-fix
oath-toolkit: Switch over to git branch (GCC7 fix)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/security/oath-toolkit/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 16 insertions, 6 deletions
diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index 965ecda164be..e41ca6f05014 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/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b889a0328d7d..d24de9f0f6da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3895,7 +3895,7 @@ with pkgs; nzbget = callPackage ../tools/networking/nzbget { }; - oathToolkit = callPackage ../tools/security/oath-toolkit { }; + oathToolkit = callPackage ../tools/security/oath-toolkit { inherit (gnome2) gtkdoc; }; obex_data_server = callPackage ../tools/bluetooth/obex-data-server { }; |