From 483200692b134c3e8ec0a25d38dd3759f7e4f092 Mon Sep 17 00:00:00 2001
From: Clemens Fruhwirth <clemens@endorphin.org>
Date: Thu, 22 Feb 2018 13:08:20 +0100
Subject: [PATCH] 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.
---
 pkgs/tools/security/oath-toolkit/default.nix | 20 +++++++++++++++-----
 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 236f8ae64014..91f588cd23e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3887,7 +3887,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 { };